From bbf8ddf16bbd0caffa5a5d93b0893bdd6a99c304 Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Mon, 6 May 2024 11:06:25 +0800
Subject: [PATCH 1/9] =?UTF-8?q?feat:=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Animal.java"                                   | 10 ++++++++++
 .../\347\254\254\344\270\200\351\242\230/Cat.java" |  7 +++++++
 .../\347\254\254\344\270\200\351\242\230/Dog.java" |  7 +++++++
 .../Main.java"                                     | 14 ++++++++++++++
 .../Circle.java"                                   |  4 ++++
 .../Main.java"                                     |  7 +++++++
 .../Rectangle.java"                                |  4 ++++
 .../Shape.java"                                    |  9 +++++++++
 8 files changed, 62 insertions(+)
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java"

diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java"
new file mode 100644
index 00000000..0d42df7d
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Animal.java"
@@ -0,0 +1,10 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题;
+
+public class Animal {
+    String name;
+    int age;
+
+    public void showInfo(){
+        System.out.println("这是父类Animal");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java"
new file mode 100644
index 00000000..0d3cde55
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Cat.java"
@@ -0,0 +1,7 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题;
+
+public class Cat extends Animal {
+    public void showInfo(){
+        System.out.println("这是子类Cat");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java"
new file mode 100644
index 00000000..294d555c
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Dog.java"
@@ -0,0 +1,7 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题;
+
+public class Dog extends Animal {
+    public void showInfo(){
+        System.out.println("这是子类Dog");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java"
new file mode 100644
index 00000000..dc0b6c63
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\200\351\242\230/Main.java"
@@ -0,0 +1,14 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第一题;
+
+public class Main {
+    public static void main(String[] args) {
+        Animal animal = new Animal();
+        animal.showInfo();
+
+        Cat cat = new Cat();
+        cat.showInfo();
+
+        Dog dog = new Dog();
+        dog.showInfo();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java"
new file mode 100644
index 00000000..b0a856b7
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java"
@@ -0,0 +1,4 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
+
+public abstract class Circle extends Shape{
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java"
new file mode 100644
index 00000000..7fd8088c
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java"
@@ -0,0 +1,7 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
+
+public class Main {
+    public static void main(String[] args) {
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java"
new file mode 100644
index 00000000..e7b77d30
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java"
@@ -0,0 +1,4 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
+
+public abstract class Rectangle extends Shape {
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java"
new file mode 100644
index 00000000..863647f1
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java"
@@ -0,0 +1,9 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
+
+public abstract class Shape {
+    String color;
+    double area;
+    public abstract void calculateArea(){
+        System.out.println();
+    };
+}
-- 
Gitee


From 098f3891fc524a05593b417b3dfeecfb4df8ebe1 Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Mon, 6 May 2024 20:41:58 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat:0506=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AirPlane.java"                            | 26 +++++++++
 .../Car.java"                                 | 25 +++++++++
 .../Test.java"                                | 18 ++++++
 .../Vehicles.java"                            | 56 +++++++++++++++++++
 4 files changed, 125 insertions(+)
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
 create mode 100644 "work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java"

diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java"
new file mode 100644
index 00000000..3849eaaa
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AirPlane.java"
@@ -0,0 +1,26 @@
+package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138;
+
+public class AirPlane extends Vehicles {
+    AirPlane() {
+    }
+
+    AirPlane(String type, String brand, String color, String place) {
+        super(type, brand, color, place);
+    }
+
+    @Override
+    public void travel() {
+        System.out.println("坐着" + color + brand + type + "前往" + place + "旅游");
+    }
+
+    //    编写带有飞机颜色和品牌两个参数及String返回值的方法  combination();
+    public String combination(String color, String brand) {
+        return color + brand;
+    }
+
+    //    编写带有品牌参数及String返回值的方法  combination();
+    public String combination(String brand) {
+        return brand;
+    }
+
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java"
new file mode 100644
index 00000000..c138af6e
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Car.java"
@@ -0,0 +1,25 @@
+package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138;
+
+public class Car extends Vehicles {
+    Car() {
+    }
+
+    Car(String type, String brand, String color, String place) {
+        super(type, brand, color, place);
+    }
+
+    @Override
+    public void travel() {
+        System.out.println("开着" + color +brand + type + "前往" + place + "旅游");
+    }
+
+    //    编写带有汽车颜色和品牌两个参数及String返回值的方法  combination();
+    public String combination(String color, String brand) {
+        return color + brand;
+    }
+
+    //    编写带有品牌参数及String返回值的方法  combination();
+    public String combination(String brand) {
+        return brand;
+    }
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
new file mode 100644
index 00000000..4626b7c6
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
@@ -0,0 +1,18 @@
+package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138;
+
+public class Test {
+    public static void main(String[] args) {
+//        开着白色大众汽车前往北京旅游；
+        Car car1 = new Car("汽车","大众","白色","北京");
+        car1.travel();
+//        开着奔驰汽车前往东山岛旅游；
+        Car car2 = new Car("汽车","奔驰","","东山岛");
+        car2.travel();
+//        坐着蓝色波音客机前往大理旅游；
+        AirPlane airPlane1 = new AirPlane("客机","波音","蓝色","大理");
+        airPlane1.travel();
+//        坐着空客客机前往哈尔滨岛旅游；
+        AirPlane airPlane2 = new AirPlane("客机","空客","","哈尔滨岛");
+        airPlane2.travel();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java"
new file mode 100644
index 00000000..c4971035
--- /dev/null
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java"
@@ -0,0 +1,56 @@
+package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138;
+
+import sun.awt.OverrideNativeWindowHandle;
+
+public class Vehicles {
+    String type;
+    String brand;
+    String color;
+    String place;
+
+    Vehicles() {
+    }
+
+    Vehicles(String type, String brand, String color,String place) {
+        this.type = type;
+        this.brand = brand;
+        this.color = color;
+        this.place = place;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getPlace() {
+        return place;
+    }
+
+    public void setPlace() {
+        this.place = place;
+    }
+
+    public void travel() {
+
+    }
+}
-- 
Gitee


From c2277ab513b081f8eb1e2785b235739d08c7db19 Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Tue, 7 May 2024 14:55:08 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Test.java"                                            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
index 4626b7c6..6e34fe04 100644
--- "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
@@ -3,16 +3,16 @@ package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138;
 public class Test {
     public static void main(String[] args) {
 //        开着白色大众汽车前往北京旅游；
-        Car car1 = new Car("汽车","大众","白色","北京");
+        Vehicles car1 = new Car("汽车","大众","白色","北京");
         car1.travel();
 //        开着奔驰汽车前往东山岛旅游；
-        Car car2 = new Car("汽车","奔驰","","东山岛");
+        Vehicles car2 = new Car("汽车","奔驰","","东山岛");
         car2.travel();
 //        坐着蓝色波音客机前往大理旅游；
-        AirPlane airPlane1 = new AirPlane("客机","波音","蓝色","大理");
+        Vehicles airPlane1 = new AirPlane("客机","波音","蓝色","大理");
         airPlane1.travel();
 //        坐着空客客机前往哈尔滨岛旅游；
-        AirPlane airPlane2 = new AirPlane("客机","空客","","哈尔滨岛");
+        Vehicles airPlane2 = new AirPlane("客机","空客","","哈尔滨岛");
         airPlane2.travel();
     }
 }
-- 
Gitee


From 4dcb2c607a04c917ad83a1e4c1859558c43a4aeb Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Thu, 9 May 2024 17:15:33 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat:=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Employee.java"                            | 26 +++++++++++++++++++
 .../Manager.java"                             | 17 ++++++++++++
 .../Staff.java"                               |  7 +++++
 .../Test.java"                                | 16 ++++++++++++
 .../Circle.java"                              |  9 ++++++-
 .../Main.java"                                |  5 +++-
 .../Rectangle.java"                           | 10 ++++++-
 .../Shape.java"                               | 25 ++++++++++++++----
 8 files changed, 107 insertions(+), 8 deletions(-)
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Employee.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Manager.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Staff.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Test.java"

diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Employee.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Employee.java"
new file mode 100644
index 00000000..ea8949d1
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Employee.java"
@@ -0,0 +1,26 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第三题;
+
+public class Employee {
+    private String name;
+    private double salary;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getSalary() {
+        return salary;
+    }
+
+    public void setSalary(double salary) {
+        this.salary = salary;
+    }
+
+    public void getAnnualSalary(){
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Manager.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Manager.java"
new file mode 100644
index 00000000..eb028884
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Manager.java"
@@ -0,0 +1,17 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第三题;
+
+public class Manager extends Employee{
+    private double bonus;
+
+    public double getBonus() {
+        return bonus;
+    }
+
+    public void setBonus(double bonus) {
+        this.bonus = bonus;
+    }
+
+    public void getAnnualSalary(){
+        System.out.println(getName() + "的工资和奖金分别是:" + getSalary()+"元，" + getBonus() + "元" );
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Staff.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Staff.java"
new file mode 100644
index 00000000..8667ba54
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Staff.java"
@@ -0,0 +1,7 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第三题;
+
+public class Staff extends Employee{
+    public void getAnnualSalary(){
+        System.out.println(getName() + "的工资:" + getSalary() + "元");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Test.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Test.java"
new file mode 100644
index 00000000..31728da0
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\270\211\351\242\230/Test.java"
@@ -0,0 +1,16 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第三题;
+
+public class Test {
+    public static void main(String[] args) {
+        Manager manager = new Manager();
+        manager.setName("经理");
+        manager.setSalary(49999.0);
+        manager.setBonus(29999.0);
+        manager.getAnnualSalary();
+
+        Staff staff = new Staff();
+        staff.setName("员工");
+        staff.setSalary(29999.0);
+        staff.getAnnualSalary();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java"
index b0a856b7..1a830f4c 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Circle.java"
@@ -1,4 +1,11 @@
 package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
 
-public abstract class Circle extends Shape{
+public class Circle extends Shape{
+    @Override
+    public void calculateArea() {
+        double r = 2.0;
+        double s = 3.14*(r*r);
+        setArea(s);
+        System.out.println(getArea());
+    }
 }
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java"
index 7fd8088c..45095ec2 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Main.java"
@@ -2,6 +2,9 @@ package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
 
 public class Main {
     public static void main(String[] args) {
-
+        Circle circle = new Circle();
+        circle.calculateArea();
+        Rectangle rectangle = new Rectangle();
+        rectangle.calculateArea();
     }
 }
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java"
index e7b77d30..6b640ae1 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Rectangle.java"
@@ -1,4 +1,12 @@
 package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
 
-public abstract class Rectangle extends Shape {
+public class Rectangle extends Shape {
+    @Override
+    public void calculateArea() {
+        double Long = 3;
+        double Width = 3;
+        double s = Long * Width;
+        setArea(s);
+        System.out.println(getArea());
+    }
 }
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java"
index 863647f1..4439d9f7 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\214\351\242\230/Shape.java"
@@ -1,9 +1,24 @@
 package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
 
 public abstract class Shape {
-    String color;
-    double area;
-    public abstract void calculateArea(){
-        System.out.println();
-    };
+    private String color;
+    private double area;
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public double getArea() {
+        return area;
+    }
+
+    public void setArea(double area) {
+        this.area = area;
+    }
+
+    public abstract void calculateArea();
 }
-- 
Gitee


From c65cf565180ad455f80a0530c01cf9005b84aef0 Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Thu, 9 May 2024 09:17:16 +0000
Subject: [PATCH 5/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20java?=
 =?UTF-8?q?2301.iml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java2301.iml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 java2301.iml

diff --git a/java2301.iml b/java2301.iml
deleted file mode 100644
index bff56e42..00000000
--- a/java2301.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/work" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
-- 
Gitee


From 2e28d61f001478a41dd8d82c12706de151d41b66 Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Thu, 9 May 2024 17:20:00 +0800
Subject: [PATCH 6/9] =?UTF-8?q?feat:=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../\344\275\234\344\270\232/Main.java"                         | 2 +-
 .../\344\275\234\344\270\232/Person.java"                       | 2 +-
 .../\344\275\234\344\270\232/Student.java"                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java" => "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Main.java" (95%)
 rename "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Person.java" => "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Person.java" (96%)
 rename "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java" => "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Student.java" (98%)

diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Main.java"
similarity index 95%
rename from "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java"
rename to "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Main.java"
index 436b7983..0709d754 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Main.java"
@@ -1,4 +1,4 @@
-package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138;
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.作业;
 
 public class Main {
     public static void main(String[] args) {
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Person.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Person.java"
similarity index 96%
rename from "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Person.java"
rename to "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Person.java"
index 5c8d3ee8..c8bb4f5a 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Person.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Person.java"
@@ -1,4 +1,4 @@
-package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138;
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.作业;
 
 //1）.声明一个名为Person的类，里面有name与age两个属性，并声明一个含有两个参数的构造方法；
 public class Person {
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Student.java"
similarity index 98%
rename from "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java"
rename to "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Student.java"
index 2fa841de..2c5fc354 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\344\275\234\344\270\232/Student.java"
@@ -1,4 +1,4 @@
-package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138;
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.作业;
 
 
 public class Student extends Person {
-- 
Gitee


From 921adc44da473ccc5e208a179a33afb3dacbdaa9 Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Fri, 10 May 2024 21:02:38 +0800
Subject: [PATCH 7/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Android.java"                             | 10 +++++++
 .../IOS.java"                                 | 10 +++++++
 .../Main.java"                                | 11 ++++++++
 .../Phone.java"                               | 26 +++++++++++++++++++
 .../Bike.java"                                | 10 +++++++
 .../Car.java"                                 | 10 +++++++
 .../Test.java"                                | 11 ++++++++
 .../Vehicle.java"                             | 26 +++++++++++++++++++
 .../Vehicles.java"                            |  2 --
 9 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Android.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/IOS.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Main.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Phone.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Test.java"
 create mode 100644 "work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Vehicle.java"

diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Android.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Android.java"
new file mode 100644
index 00000000..cbbe3a60
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Android.java"
@@ -0,0 +1,10 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第五题;
+
+public class Android extends Phone{
+    @Override
+    public void sendMassage() {
+        setBrand("安卓系统");
+        setPrice(9999);
+        System.out.println(getBrand() + getPrice());
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/IOS.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/IOS.java"
new file mode 100644
index 00000000..c8593019
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/IOS.java"
@@ -0,0 +1,10 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第五题;
+
+public class IOS extends Phone{
+    @Override
+    public void sendMassage() {
+    setBrand("苹果系统");
+    setPrice(8888);
+        System.out.println(getBrand() + getPrice());
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Main.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Main.java"
new file mode 100644
index 00000000..8ff22327
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Main.java"
@@ -0,0 +1,11 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第五题;
+
+public class Main {
+    public static void main(String[] args) {
+        Android android = new Android();
+        android.sendMassage();
+
+        IOS ios = new IOS();
+        ios.sendMassage();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Phone.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Phone.java"
new file mode 100644
index 00000000..88a5e7af
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\344\272\224\351\242\230/Phone.java"
@@ -0,0 +1,26 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第五题;
+
+public class Phone {
+    private String Brand;
+    private int price;
+
+    public String getBrand() {
+        return Brand;
+    }
+
+    public void setBrand(String brand) {
+        Brand = brand;
+    }
+
+    public int getPrice() {
+        return price;
+    }
+
+    public void setPrice(int price) {
+        this.price = price;
+    }
+
+    public void sendMassage(){
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java"
new file mode 100644
index 00000000..a27132ec
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java"
@@ -0,0 +1,10 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第四题;
+
+public class Bike extends Vehicle{
+    @Override
+    public void showInfo() {
+        setBrand("梅赛德斯");
+        setPrice(9999);
+        System.out.println(getBrand() + getPrice());
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java"
new file mode 100644
index 00000000..17f533f7
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java"
@@ -0,0 +1,10 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第四题;
+
+public class Car extends Vehicle {
+    @Override
+    public void showInfo() {
+        setBrand("迈巴赫S680");
+        setPrice(6000000);
+        System.out.println("吴佳宇先生," + "您已购买价格为：" + getPrice() + "的" + getBrand());
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Test.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Test.java"
new file mode 100644
index 00000000..2f5fe1d0
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Test.java"
@@ -0,0 +1,11 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第四题;
+
+public class Test {
+    public static void main(String[] args) {
+        Car car = new Car();
+        car.showInfo();
+
+        Bike bike = new Bike();
+        bike.showInfo();
+    }
+}
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Vehicle.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Vehicle.java"
new file mode 100644
index 00000000..2e6770d4
--- /dev/null
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Vehicle.java"
@@ -0,0 +1,26 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第四题;
+
+public class Vehicle {
+    private String brand;
+    private int price;
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public int getPrice() {
+        return price;
+    }
+
+    public void setPrice(int price) {
+        this.price = price;
+    }
+
+    public void showInfo() {
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java" "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java"
index c4971035..c662bdd2 100644
--- "a/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java"
+++ "b/work/com/java/minxi/java_20240506/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Vehicles.java"
@@ -1,7 +1,5 @@
 package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138;
 
-import sun.awt.OverrideNativeWindowHandle;
-
 public class Vehicles {
     String type;
     String brand;
-- 
Gitee


From 61f2b036c5f7399b30c9f35f5deb0e5c8d436e6f Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Fri, 10 May 2024 21:06:08 +0800
Subject: [PATCH 8/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../\347\254\254\345\233\233\351\242\230/Bike.java"             | 2 +-
 .../\347\254\254\345\233\233\351\242\230/Car.java"              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java"
index a27132ec..d87490b4 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Bike.java"
@@ -5,6 +5,6 @@ public class Bike extends Vehicle{
     public void showInfo() {
         setBrand("梅赛德斯");
         setPrice(9999);
-        System.out.println(getBrand() + getPrice());
+        System.out.println("\n" +getBrand() + getPrice());
     }
 }
diff --git "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java" "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java"
index 17f533f7..f7393247 100644
--- "a/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java"
+++ "b/work/com/java/minxi/java_20240428/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/\347\254\254\345\233\233\351\242\230/Car.java"
@@ -5,6 +5,6 @@ public class Car extends Vehicle {
     public void showInfo() {
         setBrand("迈巴赫S680");
         setPrice(6000000);
-        System.out.println("吴佳宇先生," + "您已购买价格为：" + getPrice() + "的" + getBrand());
+        System.out.println("\n" + "吴佳宇先生," + "您已购买价格为：" + getPrice() + "的" + getBrand());
     }
 }
-- 
Gitee


From 629fd5747c52f25f838b2a498de8bdb8d97c1ac6 Mon Sep 17 00:00:00 2001
From: WJY-7 <2541095587@qq.com>
Date: Sun, 12 May 2024 10:33:06 +0800
Subject: [PATCH 9/9] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A40507=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bus.java"                                 | 13 +++++++++
 .../ControlTemperature.java"                  |  5 ++++
 .../Main.java"                                | 28 +++++++++++++++++++
 .../MoneyFare.java"                           |  5 ++++
 .../MotorVehicles.java"                       |  5 ++++
 .../Taxi.java"                                | 18 ++++++++++++
 6 files changed, 74 insertions(+)
 create mode 100644 "work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Bus.java"
 create mode 100644 "work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/ControlTemperature.java"
 create mode 100644 "work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java"
 create mode 100644 "work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MoneyFare.java"
 create mode 100644 "work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MotorVehicles.java"
 create mode 100644 "work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Taxi.java"

diff --git "a/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Bus.java" "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Bus.java"
new file mode 100644
index 00000000..b1efa89b
--- /dev/null
+++ "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Bus.java"
@@ -0,0 +1,13 @@
+package com.java.minxi.java_20240507.java_2301_吴佳宇_2344310138;
+
+public class Bus extends MotorVehicles implements MoneyFare{
+    @Override
+    public void brake(String s) {
+        System.out.println("公共汽车使用的刹车技术: " + s);
+    }
+
+    @Override
+    public void charge(String c) {
+        System.out.println("公共汽车：" + c + "元/张,不计算公里数");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/ControlTemperature.java" "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/ControlTemperature.java"
new file mode 100644
index 00000000..673e7fcd
--- /dev/null
+++ "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/ControlTemperature.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240507.java_2301_吴佳宇_2344310138;
+
+public interface ControlTemperature {
+    public void controlAirTemperature(String t);
+}
diff --git "a/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java" "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java"
new file mode 100644
index 00000000..4f534e3f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Main.java"
@@ -0,0 +1,28 @@
+package com.java.minxi.java_20240507.java_2301_吴佳宇_2344310138;
+
+import com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138.Test;
+
+import java.util.Scanner;
+
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("请输入公交车采用的刹车技术和车票价(元)：");
+        Scanner sc1 = new Scanner(System.in);
+        String A = sc1.next();
+        String B = sc1.next();
+        Bus bus = new Bus();
+        bus.brake(A);
+        bus.charge(B);
+
+        System.out.println("请输入出租车采用的刹车技术，车票价(元)，安装的空调样式：");
+        Scanner sc2 = new Scanner(System.in);
+        String C = sc2.next();
+        String D = sc2.next();
+        String E = sc2.next();
+        Taxi taxi = new Taxi();
+        taxi.brake(C);
+        taxi.charge(D);
+        taxi.controlAirTemperature(E);
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MoneyFare.java" "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MoneyFare.java"
new file mode 100644
index 00000000..0a14798d
--- /dev/null
+++ "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MoneyFare.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240507.java_2301_吴佳宇_2344310138;
+
+public interface MoneyFare {
+    public void charge(String c);
+}
diff --git "a/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MotorVehicles.java" "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MotorVehicles.java"
new file mode 100644
index 00000000..dddc021b
--- /dev/null
+++ "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MotorVehicles.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240507.java_2301_吴佳宇_2344310138;
+
+public abstract class MotorVehicles {
+    public abstract void brake(String s);
+}
diff --git "a/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Taxi.java" "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Taxi.java"
new file mode 100644
index 00000000..14f234ed
--- /dev/null
+++ "b/work/com/java/minxi/java_20240507/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Taxi.java"
@@ -0,0 +1,18 @@
+package com.java.minxi.java_20240507.java_2301_吴佳宇_2344310138;
+
+public class Taxi extends MotorVehicles implements MoneyFare,ControlTemperature{
+    @Override
+    public void controlAirTemperature(String t) {
+        System.out.println("出租车安装了" + t + "空调");
+    }
+
+    @Override
+    public void charge(String c) {
+        System.out.println("出租车：" + c + "元/公里，起步价3公里");
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("出租车使用的刹车技术：" + s);
+    }
+}
-- 
Gitee