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 0000000000000000000000000000000000000000..0d42df7dd6ff30b36254a5c65cc221be176056d2
--- /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 0000000000000000000000000000000000000000..0d3cde55e4bc88818b946db9bf98a989dff5f68c
--- /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 0000000000000000000000000000000000000000..294d555cc5684d66c70f4302ec2bd4aedbcbfab7
--- /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 0000000000000000000000000000000000000000..dc0b6c630731c6f8bceb1df4ce665ccc82367a90
--- /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 0000000000000000000000000000000000000000..b0a856b7074b63c6c9608361ab5279cdee3db571
--- /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 0000000000000000000000000000000000000000..7fd8088cb49991b5fac592a334592c51e08e96b0
--- /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 0000000000000000000000000000000000000000..e7b77d3001c3ae8fd5760f86d370d253015c4fba
--- /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 0000000000000000000000000000000000000000..863647f13829050ff083647ebc84d69b6d5fa9ad
--- /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();
+    };
+}
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 0000000000000000000000000000000000000000..3849eaaaa93fd3a1099c20f70aacac899f41ed0c
--- /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 0000000000000000000000000000000000000000..c138af6ef93c7aaaa437b20249a101163ab1156d
--- /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 0000000000000000000000000000000000000000..6e34fe04d9bc25e5043f1343ca9322342be564fe
--- /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) {
+//        开着白色大众汽车前往北京旅游；
+        Vehicles car1 = new Car("汽车","大众","白色","北京");
+        car1.travel();
+//        开着奔驰汽车前往东山岛旅游；
+        Vehicles car2 = new Car("汽车","奔驰","","东山岛");
+        car2.travel();
+//        坐着蓝色波音客机前往大理旅游；
+        Vehicles airPlane1 = new AirPlane("客机","波音","蓝色","大理");
+        airPlane1.travel();
+//        坐着空客客机前往哈尔滨岛旅游；
+        Vehicles 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 0000000000000000000000000000000000000000..c4971035299a7202d91adde82a508da726023ae0
--- /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() {
+
+    }
+}