diff --git "a/work/com/java/minxi/java_20240415/java_2301_\345\274\240\344\270\211_2344000000/MainTest.java" "b/work/com/java/minxi/java_20240415/java_2301_\345\274\240\344\270\211_2344000000/MainTest.java"
index 1c791f01ecb48302efcddd8963e37a1ccecb6cf4..dcf7245d99f1bcf27e04d9d32c48cf2fe6dfe139 100644
--- "a/work/com/java/minxi/java_20240415/java_2301_\345\274\240\344\270\211_2344000000/MainTest.java"
+++ "b/work/com/java/minxi/java_20240415/java_2301_\345\274\240\344\270\211_2344000000/MainTest.java"
@@ -3,6 +3,6 @@ package com.java.minxi.java_20240415.java_2301_张三_2344000000;
 public class MainTest {
 
     public static void main(String[] args) {
-        System.out.println("Hello World");
+        System.out.println("Hello World ");
     }
 }
diff --git "a/work/com/java/minxi/java_20240418/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java" "b/work/com/java/minxi/java_20240418/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java"
new file mode 100644
index 0000000000000000000000000000000000000000..c4aae3e748a72162de5f1afcd6b0456cb4363361
--- /dev/null
+++ "b/work/com/java/minxi/java_20240418/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java"
@@ -0,0 +1,19 @@
+package com.java.minxi.java_20240418.java_2301_吴佳宇_2344310138;
+
+public class Student {
+    int id;
+    String name;
+    int age;
+    String sex;
+
+    public void run() {
+        System.out.println(name + "正在跑步  ");
+    }
+
+    public void eat() {
+        System.out.println(name + "正在吃饭");
+    }
+    public void sleep() {
+        System.out.println(name + "正在睡觉");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240418/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/StudentMain.java" "b/work/com/java/minxi/java_20240418/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/StudentMain.java"
new file mode 100644
index 0000000000000000000000000000000000000000..fc1171154fe7474e2a17ceef7eb455beb1ce551a
--- /dev/null
+++ "b/work/com/java/minxi/java_20240418/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/StudentMain.java"
@@ -0,0 +1,28 @@
+package com.java.minxi.java_20240418.java_2301_吴佳宇_2344310138;
+
+public class StudentMain {
+    public static void main(String[] args) {
+        Student st1 = new Student();
+        st1.id = 1;
+        st1.name = "张三 ";
+        st1.age = 21;
+        st1.sex = "男";
+
+        Student st2 = new Student();
+        st2.id = 2;
+        st2.name = "李四";
+        st2.age = 25;
+        st2.sex = "男";
+
+        Student st3 = new Student();
+        st3.id = 3;
+        st3.name = "王丽 ";
+        st3.age = 19;
+        st3.sex = "女";
+
+        st1.run();
+        st2.eat();
+        st3.sleep();
+    }
+
+}
diff --git "a/work/com/java/minxi/java_20240422/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Appliances.java" "b/work/com/java/minxi/java_20240422/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Appliances.java"
new file mode 100644
index 0000000000000000000000000000000000000000..3f6d742c2b113838ec2249982bcb4bf301eea61f
--- /dev/null
+++ "b/work/com/java/minxi/java_20240422/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Appliances.java"
@@ -0,0 +1,125 @@
+package com.java.minxi.java_20240422.java_2301_吴佳宇_2344310138;
+
+public class Appliances {
+    //属性
+    //    成员变量
+    String brand; //品牌
+    int weight; //重量
+    String type; //种类
+
+    //方法
+
+    //    洗衣服
+    public String wash() {
+        return brand + type + "正在洗衣服 ";
+    }
+
+    //    做飯
+    public String cook() {
+        return brand + type + "正在炖鸡汤";
+    }
+
+    //    称重
+    public String weigh() {
+        return brand + type + "有" + weight + "kg重";
+    }
+
+    //    实例方法
+
+    //    brand赋值
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    //brand取值
+    public String getBrand() {
+        return brand;
+    }
+
+    //weight赋值
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    //weight取值
+    public int getWeight() {
+        return weight;
+    }
+
+    //    type赋值
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    //    type取值
+    public String getType() {
+        return type;
+    }
+
+    //  无参构造方法
+    Appliances() {
+    }
+
+    //    有参构造方法
+    Appliances(String brand, int weight, String type) {
+        this.brand = brand;
+        this.weight = weight;
+        this.type = type;
+    }
+
+    //    创建空调静态内部类
+    public static class airconditioning {
+
+        //    内部类属性
+        String brand;  //品牌
+        String type;  //类别
+
+        //        内部类方法
+
+        //        制冷
+        public String refrigeration() {
+            return brand + type + "正在制冷";
+        }
+
+        //        制热
+        public String heating() {
+            return brand + type + "正在制热";
+        }
+
+//        内部类实例方法
+
+        //brand赋值
+        public void setBrand(String brand) {
+            this.brand = brand;
+        }
+
+        //        brand取值
+        public String getBrand() {
+            return brand;
+        }
+
+        //type赋值
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        //        type取值
+        public String getType() {
+            return type;
+        }
+
+
+        //        无参构造方法
+        public airconditioning() {
+        }
+
+        //        有参构造方法
+        public airconditioning(String brand, String type) {
+            this.brand = brand;
+            this.type = type;
+        }
+
+
+    }
+
+}
diff --git "a/work/com/java/minxi/java_20240422/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AppliancesMain.java" "b/work/com/java/minxi/java_20240422/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AppliancesMain.java"
new file mode 100644
index 0000000000000000000000000000000000000000..4c57d29f11218140353f2f6a89666645deb63546
--- /dev/null
+++ "b/work/com/java/minxi/java_20240422/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/AppliancesMain.java"
@@ -0,0 +1,61 @@
+package com.java.minxi.java_20240422.java_2301_吴佳宇_2344310138;
+public class AppliancesMain {
+    public static void main(String[] args) {
+
+//        1)使用简单的对象调用属性方式对属性赋值并在控制台中输出：
+//        洗衣服
+        Appliances HaierWash1 = new Appliances();
+        HaierWash1.brand = "海尔";
+        HaierWash1.type = "洗衣机";
+//炖鸡汤
+        Appliances MeideCook1 = new Appliances();
+        MeideCook1.brand = "美的";
+        MeideCook1.type = "电饭锅";
+//称重
+        Appliances HaierFridge1 = new Appliances();
+        HaierFridge1.brand = "海尔 ";
+        HaierFridge1.type = "冰箱";
+        HaierFridge1.weight = 50;
+//制冷
+        Appliances.airconditioning DajinHavc1 = new Appliances.airconditioning();
+        DajinHavc1.brand = "大金";
+        DajinHavc1.type = "空调";
+//输出
+        System.out.println("“" + HaierWash1.wash() + "”,“" + MeideCook1.cook() + "”,“" + HaierFridge1.weigh() + "”,“" + DajinHavc1.refrigeration() + "”;");
+
+//        2)使用实例方法的方式对属性赋值并在控制台中输出：
+//        洗衣服
+        Appliances HaierWash2 = new Appliances();
+        HaierWash2.setBrand("海尔");
+        HaierWash2.setType("洗衣机");
+//        炖鸡汤
+        Appliances MeideCook2 = new Appliances();
+        MeideCook2.setBrand("美的");
+        MeideCook2.setType("电饭锅");
+//        称重
+        Appliances HaierFridge2 = new Appliances();
+        HaierFridge2.setBrand("海尔");
+        HaierFridge2.setType("冰箱");
+        HaierFridge2.setWeight(50);
+//        制冷
+        Appliances.airconditioning DajinHavc2 = new Appliances.airconditioning();
+        DajinHavc2.setBrand("大金");
+        DajinHavc2.setType("空调");
+//        输出
+        System.out.println("“" + HaierWash2.wash() + "”,“" + MeideCook2.cook() + "”,“" + HaierFridge2.weigh() + "”,“" + DajinHavc2.refrigeration() + "”;");
+
+//        3)使用构造方法的方式对属性赋值并在控制台中输出：
+//        洗衣服
+        Appliances HaierWash3 = new Appliances("海尔",0,"洗衣机");
+//        炖鸡汤
+        Appliances MeideCook3 = new Appliances("美的",0,"电饭锅");
+//        称重
+        Appliances HaierFridge3 = new Appliances("海尔",50,"冰箱");
+//        制冷
+        Appliances.airconditioning DajinHavc3 = new Appliances.airconditioning("大金","空调");
+//        输出
+        System.out.println("“" + HaierWash3.wash() + "”,“" + MeideCook3.cook() + "”,“" + HaierFridge3.weigh() + "”,“" + DajinHavc3.refrigeration() + "”;");
+
+    }
+
+}
diff --git "a/work/com/java/minxi/java_20240425/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Employee.java" "b/work/com/java/minxi/java_20240425/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Employee.java"
new file mode 100644
index 0000000000000000000000000000000000000000..32171e609cc44f4ac7e97555bb064c74f50382be
--- /dev/null
+++ "b/work/com/java/minxi/java_20240425/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Employee.java"
@@ -0,0 +1,127 @@
+package com.java.minxi.java_20240425.java_2301_吴佳宇_2344310138;
+
+import java.util.Scanner;
+import java.util.SplittableRandom;
+
+public class Employee {
+
+    //    1.创建员工类，员工类中包含员工ID（Long类型）、账号（String类型）、密码（String类型）、姓名（String类型）、年龄（int类型）属性；
+//    使用封装思想，将员工类的变量进行封装，并提供对外访问的方式
+    //    属性
+    private long ID;    //员工ID
+    private String account; //账号
+    private String password;    //密码
+    private String name;    //姓名
+    private int age;    //年龄
+
+    //2.创建员工类的无参及有参构造
+//    无参构造
+    Employee() {
+    }
+
+    //    有参构造
+    Employee(long ID, String account, String password, String name, int age) {
+        this.ID = ID;
+        this.account = account;
+        this.password = password;
+        this.name = name;
+        this.age = age;
+    }
+
+    //实例方法
+    //员工ID赋值
+    public void setId(long  ID) {
+        this.ID= ID;
+    }
+
+    //员工ID取值
+    public long getID() {
+        return ID;
+    }
+
+    //账号赋值
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    //    账号取值
+    public String getAccount() {
+        return account;
+    }
+
+    //密码赋值
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    //    密码取值
+    public String getPassword() {
+        return password;
+    }
+
+    //姓名赋值
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    //    姓名取值
+    public String getName() {
+        return name;
+    }
+
+    //年龄赋值
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    //    年龄取值
+    public int getAge() {
+        return age;
+    }
+
+    public void math() {
+        Scanner sc = new Scanner(System.in);
+        boolean answer = false;
+        while (true) {
+            if (!answer) {
+                System.out.println("欢迎使用登录系统");
+                System.out.print("请输入员工账号:");
+                String account = sc.nextLine();
+                System.out.print("请输入员工密码:");
+                String password = sc.nextLine();
+                if (this.account.equals(account) && this.password.equals(password)) {
+                    System.out.println("登录成功");
+                    System.out.println("1.继续操作");
+                    System.out.println("2.退出登录");
+                    System.out.println("请选择:");
+                    Scanner aaa=new Scanner(System.in);
+                    int albsz = aaa.nextInt();
+                    if (albsz==2){
+                        System.out.println("退出成功");
+                    } else if (albsz==1) {
+                        System.out.println("请输入员工ID");
+                        long staffid=sc.nextLong();
+//                       Scanner input=new Scanner(System.in);不会导致输入员工id后直接打印以下的第一种方法
+                        System.out.println("请输入员工密码");
+                        sc.nextLine();   //不会导致输入员工id后直接打印以下的第二种方法，也就是接收结束符;
+                        String staffpassword = sc.nextLine();
+//                       String staffpassword = input.nextLine();不会导致输入员工id后直接打印以下的第一种方法
+                        if( this.ID==staffid && this.password.equals(staffpassword)) {
+                            System.out.println("打卡成功");
+                            break;
+                        } else{
+                            System.out.print("ID或密码错误,");
+                            System.out.println("打卡失败");
+                        }
+                    }
+
+                }else {
+                    System.out.println("账号或密码错误");
+                }
+            }
+        }
+
+    }
+
+}
+
diff --git "a/work/com/java/minxi/java_20240425/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/EmployeeMain.java" "b/work/com/java/minxi/java_20240425/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/EmployeeMain.java"
new file mode 100644
index 0000000000000000000000000000000000000000..d61ead4a7bc245e214b70d479def3d2095473a47
--- /dev/null
+++ "b/work/com/java/minxi/java_20240425/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/EmployeeMain.java"
@@ -0,0 +1,11 @@
+package com.java.minxi.java_20240425.java_2301_吴佳宇_2344310138;
+
+import java.util.Scanner;
+
+public class EmployeeMain {
+    public static void main(String[] args) {
+        Employee user = new Employee(01L, " ABC", "abc123", "www", 99);// 自定义员工数据
+        user.math();
+
+    }
+}
diff --git "a/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" "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"
new file mode 100644
index 0000000000000000000000000000000000000000..55e1aefb1fed68ffa49b51fee393708501385fd7
--- /dev/null
+++ "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"
@@ -0,0 +1,8 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.作业;
+
+public class Main {
+    public static void main(String[] args) {
+        Student student = new Student(" 张三",18,"龙岩学院");
+        student.intro();
+    }
+}
diff --git "a/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" "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"
new file mode 100644
index 0000000000000000000000000000000000000000..adf01df509088a2c5df883e2593192772f386271
--- /dev/null
+++ "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"
@@ -0,0 +1,16 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.作业;
+
+//1）.声明一个名为Person的类，里面有name与age两个属性，并声明一个含有两个参数的构造方法；
+public class Person {
+    String  name;
+    int age;
+
+    Person() {
+    }
+
+    Person(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+}
diff --git "a/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" "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"
new file mode 100644
index 0000000000000000000000000000000000000000..21704603ceaea38512c24ff9863454517375961b
--- /dev/null
+++ "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"
@@ -0,0 +1,15 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.作业;
+
+public class Student extends Person {
+    //2）.声明一个名为Student的类，此类继承自Person类，添加一个属性school；
+    String  school;
+    Student(String name,int age,String school){
+        super(name,age);
+        this.school = school;
+    }
+
+    //4）.定义一个intro方法，进行自我介绍，输出格式：姓名：张三，年龄：18，学校：闽西职业技术学院。注意：输出语句中“，”和“：”均为中文标点符号。
+    public void intro(){
+        System.out.println("姓名："+name+"，年龄："+age+"，学校："+school);
+    }
+}
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..e3de2b7985d7bad7eabf483c8785b42a10067c27
--- /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");
+    }
+}
\ No newline at end of file
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..d1ca108c193c50027b3ccbee7afc69ecde60c55e
--- /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..6f8d2f79b6a78ddbc70707c92eb285a2db81764c
--- /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,8 @@
+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..85d5f0e648141fe09cda2546040f4cff5c43193e
--- /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();
+    }
+}
\ No newline at end of file
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 0000000000000000000000000000000000000000..afc8f3ea0ba05e7ff7ec468a41daf10f37b0eb38
--- /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(){
+
+    }
+}
\ No newline at end of file
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 0000000000000000000000000000000000000000..d833553886b1f4073561a197a80f39321a937428
--- /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 0000000000000000000000000000000000000000..af52f37a67cba9de784fb12b53df047ac2533668
--- /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() + "元");
+    }
+}
\ No newline at end of file
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 0000000000000000000000000000000000000000..e431119cdd49321191e74d3903fbd8bf76527fea
--- /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"
new file mode 100644
index 0000000000000000000000000000000000000000..9bf84f35665f22cae8fbccf84757224d3742d0b0
--- /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,11 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
+
+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"
new file mode 100644
index 0000000000000000000000000000000000000000..a1af15c28409d26e556ab7fb68534b69a21cc92f
--- /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,10 @@
+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"
new file mode 100644
index 0000000000000000000000000000000000000000..901e352af7f0d095292506c855c7bbda1075d466
--- /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,12 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
+
+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());
+    }
+}
\ No newline at end of file
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..96c51d2935bca16b00bad0a2e06d9ffca6fb404d
--- /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,24 @@
+package com.java.minxi.java_20240428.java_2301_吴佳宇_2344310138.第二题;
+
+public abstract class  Shape {
+    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();
+}
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 0000000000000000000000000000000000000000..7dff8898a05a652529e10bfdcae63286ce543c7f
--- /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 0000000000000000000000000000000000000000..76f80828919b0761cbe961ff774e826891df2a0d
--- /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 0000000000000000000000000000000000000000..7eafb1e2815272f30c979422fbfa763f91553a88
--- /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 0000000000000000000000000000000000000000..a29bce9b3383631b2757faa98eb62dfa29279d5b
--- /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 0000000000000000000000000000000000000000..ff3273beba486e471b3a08cfbbd6b088f89a798b
--- /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("\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"
new file mode 100644
index 0000000000000000000000000000000000000000..9f909a178065994e340d526255dbe33a5a64c98d
--- /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("\n" + "吴佳宇先生," + "您已购买价格为：" + 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 0000000000000000000000000000000000000000..31f65dcf997cf6c58b47dd6a1e27190dfda51966
--- /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();
+    }
+}
\ No newline at end of file
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 0000000000000000000000000000000000000000..f9a7e96543a8734414fe428b345e333369c1fc4a
--- /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/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..0a4da01bd6cfb1bff10fedc463b25e6c33a5312a
--- /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..64d106cfde78c6dc6ec48f38343345b303524a92
--- /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..3595aec06585ea888e78936fcafec37638577d96
--- /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();
+    }
+}
\ No newline at end of file
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..490554f94abbe386c383abb4d29552cb3574e740
--- /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,54 @@
+package com.java.minxi.java_20240506.java_2301_吴佳宇_2344310138;
+
+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() {
+
+    }
+}
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 0000000000000000000000000000000000000000..be789742c17a0b63fe0d927c66b6c2ceef7fff4c
--- /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 0000000000000000000000000000000000000000..96c5645a56d12c6acced73126a8ea131b1edece0
--- /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);
+}
\ No newline at end of file
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 0000000000000000000000000000000000000000..52412f7c213cd0a1a41baad9ed9fe808fa9ffaab
--- /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 0000000000000000000000000000000000000000..f617748461db2296ece0c06162d8bae71f1f07bf
--- /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);
+}
\ No newline at end of file
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 0000000000000000000000000000000000000000..5eb60cfa997213845a6a9a53da9c995a2048a00f
--- /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 0000000000000000000000000000000000000000..e438954a232e5d2a3509327b1b38846b402d197d
--- /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);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240513/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java" "b/work/com/java/minxi/java_20240513/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
new file mode 100644
index 0000000000000000000000000000000000000000..52184371a22cab9a4dc253a0411e66cb02540cef
--- /dev/null
+++ "b/work/com/java/minxi/java_20240513/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Test.java"
@@ -0,0 +1,155 @@
+package com.java.minxi.java_20240513.java_2301_吴佳宇_2344310138;
+
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+
+import static java.util.Collections.replaceAll;
+
+public class  Test {
+    public static void main(String[] args) {
+        System.out.println("1. 创建和初始化：");
+//        1. 创建和初始化：
+//        - 创建一个`ArrayList`，初始化它，并添加5个字符串元素。
+        ArrayList<String> a = new ArrayList<String>();
+        a.add("1");
+        a.add("2");
+        a.add("3");
+        a.add("4");
+        a.add("5");
+        System.out.println(a);
+//        - 创建一个`LinkedList`，初始化它，并添加5个整数元素。
+        LinkedList<Integer> b = new LinkedList<Integer>();
+        b.add(1);
+        b.add(2);
+        b.add(3);
+        b.add(4);
+        b.add(5);
+        System.out.println(b);
+        System.out.println("==============================================");
+        System.out.println("2. 添加元素：");
+
+//        2. 添加元素：
+//        - 在`ArrayList`中添加一个元素到列表的开头。
+        System.out.println("ArrayList添加前:" + a);
+        a.add(0, "0");
+        System.out.println("ArrayList添加后:" + a);
+//        - 在`LinkedList`中添加一个元素到列表的末尾。
+        System.out.println("LinkedList添加前:" + b);
+        b.addLast(0);
+        System.out.println("LinkedList添加后:" + b);
+        System.out.println("==============================================");
+        System.out.println("3. 删除元素：");
+
+//        3. 删除元素：
+//        - 从`ArrayList`中删除索引为2的元素。
+        System.out.println("ArrayList删除前:" + a);
+        a.remove(2);
+        System.out.println("ArrayList删除索引为2的元素后:" + a);
+//        - 从`LinkedList`中删除第一个元素。
+        System.out.println("LinkedList删除前:" + b);
+        b.remove(0);
+        System.out.println("LinkedList删除第一个元素后:" + b);
+        System.out.println("==============================================");
+        System.out.println("4. 访问元素：");
+
+//        4. 访问元素：
+//        - 获取`ArrayList`中索引为3的元素。
+        System.out.println(a);
+        System.out.println("ArrayList索引为3的元素为：" + a.get(3));
+//        - 获取`LinkedList`中最后一个元素。
+        System.out.println(b);
+        System.out.println("LinkedList最后一个元素为：" + b.getLast());
+        System.out.println("==============================================");
+        System.out.println("5. 修改元素：");
+
+//        5. 修改元素：
+//        - 将`ArrayList`中索引为1的元素修改为"New Element"。
+        System.out.println("ArrayList修改前:" + a);
+        a.set(1, "New Element");
+        System.out.println("ArrayList索引为1的元素修改为New Element后:" + a);
+//        - 将`LinkedList`中索引为0的元素修改为42。
+        System.out.println("LinkedList修改前:" + b);
+        b.set(0, 42);
+        System.out.println("ArrayList索引为1的元素修改为New Element后:" + b);
+        System.out.println("==============================================");
+        System.out.println("6. 元素搜索：");
+
+//        6. 元素搜索：
+//        - 在`ArrayList`中搜索字符串"Target"的位置。
+        System.out.println(a);
+        int q = a.indexOf("Target");
+        System.out.println(q);
+//        - 在`LinkedList`中搜索整数42的位置。
+        System.out.println(b);
+        int w = b.indexOf(42);
+        System.out.println(w);
+        System.out.println("==============================================");
+        System.out.println("7. 元素替换：");
+
+//        7. 元素替换：
+//        - 将`ArrayList`中所有出现的"Old"字符串替换为"New"。
+        a.add("Old");
+        System.out.println("ArrayList替换前:" + a);
+        Collections.replaceAll(a, "Old", "New");
+        System.out.println("ArrayList替换后:" + a);
+//        - 将`LinkedList`中所有出现的数字10替换为20。
+        b.add(10);
+        System.out.println("LinkedList替换前:" + b);
+        b.replaceAll(e -> e.equals(10) ? 20 : e);
+        System.out.println("LinkedList替换后:" + b);
+        System.out.println("==============================================");
+        System.out.println("8. 列表反转：");
+
+//        8. 列表反转：
+//        - 反转`ArrayList`中的元素顺序。
+        System.out.println("ArrayList反转前:" + a);
+        Collections.reverse(a);
+        System.out.println("ArrayList反转后:" + a);
+//        - 反转`LinkedList`中的元素顺序。
+        System.out.println("LinkedList反转前:" + b);
+        Collections.reverse(b);
+        System.out.println("LinkedList反转后:" + b);
+        System.out.println("==============================================");
+        System.out.println("9. 列表排序：");
+
+//        9. 列表排序：
+//        - 对`ArrayList`中的字符串元素进行排序。
+        System.out.println("ArrayList排序前:" + a);
+        Collections.sort(a);
+        System.out.println("ArrayList排序后:" + a);
+//        - 对`LinkedList`中的整数元素进行排序。
+        System.out.println("ArrayList排序前:" + b);
+        Collections.sort(b);
+        System.out.println("ArrayList排序后:" + b);
+        System.out.println("==============================================");
+        System.out.println("10. 列表比较：");
+
+//        10. 列表比较：
+//        - 比较两个`ArrayList`是否相等。
+        ArrayList<String> A = new ArrayList<String>();
+        A.add("qw");
+        A.add("40");
+        A.add("32");
+        System.out.println("第一个arraylist：" + a);
+        System.out.println("第二个arraylist：" + A);
+        if (a.equals(A)) {
+            System.out.println("两个ArrayList相等");
+        }else {
+            System.out.println("两个ArrayList不相等");
+        }
+//        - 比较两个`LinkedList`是否相等。
+        LinkedList<Integer> B = new LinkedList<Integer>();
+        B.add(1);
+        B.add(12);
+        B.add(123);
+        System.out.println("第一个Linkedlist：" + a);
+        System.out.println("第二个Linkedlist：" + A);
+        if (b.equals(B)) {
+            System.out.println("两个LinkedList相等");
+        }else {
+            System.out.println("两个LinkedList不相等");
+        }
+    }
+}
diff --git "a/work/com/java/minxi/java_20240514/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MapTest.java" "b/work/com/java/minxi/java_20240514/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MapTest.java"
new file mode 100644
index 0000000000000000000000000000000000000000..162a2c42c264b11475ff01b37b46398d9573c472
--- /dev/null
+++ "b/work/com/java/minxi/java_20240514/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/MapTest.java"
@@ -0,0 +1,87 @@
+package com.java.minxi.java_20240514.java_2301_吴佳宇_2344310138;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MapTest {
+    public static void main(String[] args) {
+//        Map 接口习题
+//        1. **创建和添加键值对**
+//        创建一个 `HashMap` 并添加至少3对键值对，键可以是字符串，值可以是整数。
+        System.out.println("1. **创建和添加键值对**");
+        HashMap<String, Integer> a = new HashMap<>();
+        a.put("first",1);
+        a.put("second",2);
+        a.put("third",3);
+        System.out.println("============================================");
+
+//        2. **获取和打印值**
+//        使用键来获取对应的值，并打印出来。
+        System.out.println("2. **获取和打印值**");
+        System.out.println("HashMap值：" + a.get("first"));
+        System.out.println("HashMap值：" + a.get("second"));
+        System.out.println("HashMap值：" + a.get("third"));
+        System.out.println("============================================");
+
+        System.out.println("3. **检查键是否存在**");
+//        3. **检查键是否存在**
+//        检查一个特定的键是否存在于 `HashMap` 中。
+        System.out.println(a.containsKey("first"));
+        if (a.containsKey("first")){
+            System.out.println("键first存在HashMap中");
+        }
+        System.out.println("============================================");
+
+        System.out.println("4. **键集合遍历**");
+//        4. **键集合遍历**
+//        遍历 `HashMap` 的键集合，并打印每个键。
+        for (String key : a.keySet()){
+            System.out.println(key);
+        }
+        System.out.println("============================================");
+
+        System.out.println("5. **值集合遍历**");
+//        5. **值集合遍历**
+//        遍历 `HashMap` 的值集合，并打印每个值。
+        for (Integer value : a.values()){
+            System.out.println(value);
+        }
+        System.out.println("============================================");
+
+        System.out.println("6. **键值对遍历**");
+//        6. **键值对遍历**
+//        使用 `entrySet()` 遍历 `HashMap` 的所有键值对，并打印。
+      for (Map.Entry<String,Integer> entry : a.entrySet()){
+          System.out.println(entry);
+        }
+        System.out.println("============================================");
+
+        System.out.println("7. **更新值**");
+//        7. **更新值**
+//        对一个已存在的键更新其对应的值。
+        System.out.println("HashMap更新值前为：" + a);
+        a.put("third",6);
+        System.out.println("HashMap更新值后为：" + a);
+        System.out.println("============================================");
+
+        System.out.println("8. **移除键值对**");
+//        8. **移除键值对**
+//        移除一个特定的键值对，并确认它已被移除。
+        System.out.println("HashMapy移除third键前为：" + a);
+        System.out.println("所移除键所对应的值为：" + a.remove("third"));
+        System.out.println("HashMap移除third键后为：" + a);
+        System.out.println("============================================");
+
+        System.out.println("9. **Map 的大小**");
+//        9. **Map 的大小**
+//        打印出 `HashMap` 的大小。
+        System.out.println("HashMap的大小为：" + a.size());
+        System.out.println("============================================");
+
+        System.out.println("10. **使用泛型**");
+//        10. **使用泛型**
+//        创建一个泛型 `HashMap`，键为自定义对象，值为字符串，并添加键值对。
+        
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240514/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/SetTest.java" "b/work/com/java/minxi/java_20240514/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/SetTest.java"
new file mode 100644
index 0000000000000000000000000000000000000000..3720f1f5cc7cfbd5bd2459152240b59d83c3c7fb
--- /dev/null
+++ "b/work/com/java/minxi/java_20240514/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/SetTest.java"
@@ -0,0 +1,104 @@
+package com.java.minxi.java_20240514.java_2301_吴佳宇_2344310138;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class SetTest {
+    public static void main(String[] args) {
+        //SetTest 接口习题
+        System.out.println("1. 创建和添加元素");
+//        1. **创建和添加元素**
+//        创建一个 `HashSet` 并添加至少5个不同的字符串元素。
+        HashSet<String> a = new HashSet<String>();
+        a.add("你已经不再存在我世界里");
+        a.add("请不要离开我的回忆");
+        a.add("请不要离开");
+        a.add("不要离开");
+        a.add("我的回忆");
+        System.out.println(a);
+        System.out.println("==========================================");
+
+        System.out.println(" 2. **元素检查**");
+//        2. **元素检查**
+//        检查一个特定的字符串是否已经存在于你创建的 `HashSet` 中。
+        System.out.println("元素是否存在：" + a.contains("我的回忆"));
+        System.out.println("==========================================");
+
+        System.out.println("3. **元素移除**");
+//        3. **元素移除**
+//        从 `HashSet` 中移除一个已存在的元素，并确认它已被移除。
+        System.out.println("HashSet移除元素前：" + a);
+        a.remove("你已经不再存在我世界里");
+        System.out.println("HashSet移除元素后：" + a);
+        System.out.println("==========================================");
+
+        System.out.println("4. **集合大小**");
+//        4. **集合大小**
+//        打印出 `HashSet` 的大小。
+        System.out.println("HashSet的长度为：" + a.size());
+        System.out.println("==========================================");
+
+        System.out.println("5. **集合遍历**");
+//        5. **集合遍历**
+//        使用增强型 `for` 循环遍历 `HashSet` 并打印每个元素。
+        for(String H : a){
+            System.out.println(H);
+        }
+        System.out.println("==========================================");
+
+        System.out.println(" 6. **集合转换为数组**");
+//        6. **集合转换为数组**
+//        将 `HashSet` 转换为数组，并打印数组中的每个元素。
+        String[] stringArray = a.stream().toArray(String[]::new);
+        System.out.println(Arrays.toString(stringArray));
+        System.out.println("==========================================");
+
+        System.out.println("7. **集合的并集**");
+//        7. **集合的并集**
+//        创建两个 `HashSet` 对象，实现它们的并集操作。
+        HashSet<String>  b = new HashSet<String>();
+        b.add("你已经不再存在我世界里");
+        b.add("请不要离开我的回忆");
+        b.add("请不要离开");
+        b.add("不要离开");
+        System.out.println("第一个HashSet：" + a);
+        System.out.println("第二个HashSet：" + b);
+        a.addAll(b);
+        System.out.println("两个HashSet集合的并集：" + a);
+        System.out.println("==========================================");
+
+        System.out.println("8. **集合的交集**");
+//        8. **集合的交集**
+//        对上面创建的两个 `HashSet` 对象实现交集操作。
+        System.out.println("第一个HashSet：" + a);
+        System.out.println("第二个HashSet：" + b);
+        a.retainAll(b);
+        System.out.println("两个HashSet集合的交集：" + a);
+        System.out.println("==========================================");
+
+        System.out.println("9. **集合的差集**");
+//        9. **集合的差集**
+//        对上面创建的两个 `HashSet` 对象实现差集操作。
+        //重建两个HashSet(c，d)
+        HashSet<String> c = new HashSet<>();
+        c.add("喜欢你");
+        c.add("那双眼动人");
+        c.add("笑声更迷人");
+        c.add("愿再可轻抚你");
+        c.add("那可爱面容");
+        c.add("挽手说梦话");
+        c.add("像昨天你共我");
+        HashSet<String> d = new HashSet<>();
+        d.add("那双眼动人");
+        d.add("笑声更迷人");
+        d.add("愿再可轻抚你");
+        d.add("那可爱面容");
+        d.add("挽手说梦话");
+        d.add("像昨天你共我");
+        System.out.println("第一个HashSet：" + c);
+        System.out.println("第二个HashSet：" + d);
+        c.removeAll(d);
+        System.out.println("两个HashSet集合的差集：" + c);
+
+    }
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/BigDecimal\347\273\203\344\271\240\351\242\230/Test.java" "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/BigDecimal\347\273\203\344\271\240\351\242\230/Test.java"
new file mode 100644
index 0000000000000000000000000000000000000000..07d18949a44ad6f1d2ab2a73c76a82820466e35a
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/BigDecimal\347\273\203\344\271\240\351\242\230/Test.java"
@@ -0,0 +1,64 @@
+package com.java.minxi.java_20240516.java_2301_吴佳宇_2344310138.BigDecimal练习题;
+
+import java.math.BigDecimal;
+public class  Test {
+    public static void main(String[] args) {
+        //    **`BigDecimal` 类练习题：**
+//            1. 创建 BigDecimal 对象
+//   - 编写一个程序，使用字符串构造函数创建一个 `BigDecimal` 对象。
+        System.out.println("第一题");
+        String A = "123.123";
+        BigDecimal bigDecimal = new BigDecimal(A);
+        System.out.println(bigDecimal);
+        System.out.println("===================================================================");
+//            2. 基本算术运算
+//   - 实现一个方法，接受两个 `BigDecimal` 对象作为参数，执行加、减、乘、除运算。
+        System.out.println("第二题");
+        BigDecimal B1 = new BigDecimal("15.5");
+        BigDecimal B2 = new BigDecimal("5.0");
+        BigDecimal addition = addition(B1, B2);
+        System.out.println("加法：" + addition);
+        BigDecimal subtraction = subtraction(B1, B2);
+        System.out.println("减法：" + subtraction);
+        BigDecimal multiplication = multiplication(B1, B2);
+        System.out.println("乘法：" + multiplication);
+        BigDecimal division1 = division1(B1, B2);
+        System.out.println("除法：" + division1);
+        System.out.println("===================================================================");
+//            3. 舍入操作
+//   - 编写一个程序，对一个 `BigDecimal` 对象执行舍入操作，指定舍入模式和精度。
+        System.out.println("第三题");
+        BigDecimal division2 = division2(B1, B2);
+        System.out.println("除法：" + division2);
+        System.out.println("===================================================================");
+//            4. 比较 BigDecimal 对象值
+//   - 创建一个方法，比较两个 `BigDecimal` 对象的值是否相等。
+//            - 创建一个方法，比较两个 `BigDecimal` 对象的值大小。
+        System.out.println("第四题");
+        boolean isequal = isequal(B1, B2);
+        System.out.println("B1和B2两个对象相等为true，反之为false：" + isequal);
+    }
+
+
+    //第二题的方法
+    public static BigDecimal addition(BigDecimal B,BigDecimal C){
+        return B.add(C);
+    }
+    public static BigDecimal subtraction(BigDecimal B,BigDecimal C){
+        return B.subtract(C);
+    }
+    public static BigDecimal multiplication(BigDecimal B,BigDecimal C){
+        return B.multiply(C);
+    }
+    public static BigDecimal division1(BigDecimal B,BigDecimal C) {
+    return B.divide(C);
+    }
+    //第三题的方法
+    public static BigDecimal division2(BigDecimal B,BigDecimal C) {
+        return B.divide(C,BigDecimal.ROUND_HALF_UP);
+    }
+//第四题的方法
+    public static boolean isequal(BigDecimal B,BigDecimal C){
+        return B.equals(C);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Math\347\261\273\347\273\203\344\271\240\351\242\230/Test.java" "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Math\347\261\273\347\273\203\344\271\240\351\242\230/Test.java"
new file mode 100644
index 0000000000000000000000000000000000000000..7290d82bf1e4c121b002b26fa86585ffdfabeeaa
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Math\347\261\273\347\273\203\344\271\240\351\242\230/Test.java"
@@ -0,0 +1,48 @@
+package com.java.minxi.java_20240516.java_2301_吴佳宇_2344310138.Math类练习题;
+
+import java.util. Scanner;
+
+public class  Test {
+    public static void main(String[] args) {
+//        **`Math` 类练习题**：
+//        1. 绝对值
+//                - 编写一个程序，接受一个用户输入的数字，然后输出该数字的绝对值。
+        System.out.println("第一题");
+        Scanner sc = new Scanner(System.in);
+        System.out.print("请输入一个数字：");
+        int number1 = sc.nextInt();
+        int absoluteValue = Math.abs(number1);
+        System.out.println(number1 + "的绝对值为：" + absoluteValue);
+        System.out.println("==============================================================");
+
+//        2. 最小值和最大值
+//                - 创建一个方法，接受三个整数作为参数，返回这三个整数中的最小值和最大值。
+        System.out.println("第二题");
+        System.out.println("请输入三个整数：");
+        int a = sc.nextInt();
+        int b = sc.nextInt();
+        int c = sc.nextInt();
+        int min = Math.min(a,Math.min(b,c));
+        int max = Math.max(a,Math.max(b,c));
+        System.out.println("最小值为：" + min + ",最大值为：" + max);
+        System.out.println("===============================================================");
+
+//        3. 四舍五入
+//                - 编写一个程序，接受一个浮点数作为输入，并将其四舍五入到最近的整数。
+        System.out.println("第三题");
+        System.out.print("请输入一个浮点数：");
+        double number2 = sc.nextDouble();
+        int rounded = (int) Math.round(number2);
+        System.out.println("四舍五入后的整数为：" + rounded);
+//        4. 随机数生成
+//                - 使用 `Math.random()` 方法生成一个 0 到 1 之间的随机数，并将其乘以一个用户指定的输入值。
+        System.out.println("第四题");
+        System.out.print("请用户输入一个数值：");
+        double userInput = sc.nextDouble();
+        double random = Math.random();
+        double result = random * userInput;
+        System.out.println("生成的随机数乘以用户输入的数值结果为: " + result);
+//        5. 计算平均值
+//                - 创建一个方法，接受一个整数数组，并返回数组的平均值。
+    }
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Object\347\261\273\347\273\203\344\271\240\351\242\230/Person.java" "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Object\347\261\273\347\273\203\344\271\240\351\242\230/Person.java"
new file mode 100644
index 0000000000000000000000000000000000000000..0248d85f62f4465402f428ed940d83485cb920e5
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Object\347\261\273\347\273\203\344\271\240\351\242\230/Person.java"
@@ -0,0 +1,53 @@
+package com.java.minxi.java_20240516.java_2301_吴佳宇_2344310138.Object类练习题;
+
+import java.util.Objects;
+
+public class  Person {
+//    **`Object` 类练习题**：
+//            1. 重写 `toString` 方法
+//   - 创建一个 `Person` 类，包含 `name` 和 `age` 属性。重写 `toString` 方法，使其返回一个字符串，包含对象的 `name` 和 `age`。
+    //属性
+    private String name;
+    private int age;
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public int getAge() {
+        return age;
+    }
+    public void setAge(int age) {
+        this.age = age;
+    }
+    //重写toString方法
+    @Override
+    public String toString() {
+        return "Person{" +
+                "name='" + name + '\'' +
+                ", age=" + age +
+                '}';
+    }
+
+    //            2. 使用 `equals` 方法
+//   - 在 `Person` 类中重写 `equals` 方法，使得可以通过 `name` 和 `age` 属性比较两个 `Person` 对象是否相等。
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Person person = (Person) o;
+        return age == person.age && Objects.equals(name, person.name);
+    }
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, age);
+    }
+
+    public static void main(String[] args) {
+        Person person = new Person();
+        person.setName("龙哥");
+        person.setAge(19);
+        System.out.println(person.toString());
+    }
+}
diff --git "a/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/String\347\261\273\347\273\203\344\271\240\351\242\230/Main.java" "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/String\347\261\273\347\273\203\344\271\240\351\242\230/Main.java"
new file mode 100644
index 0000000000000000000000000000000000000000..50323fa310716489f98e04945f642e1ace21cb6e
--- /dev/null
+++ "b/work/com/java/minxi/java_20240516/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/String\347\261\273\347\273\203\344\271\240\351\242\230/Main.java"
@@ -0,0 +1,104 @@
+package com.java.minxi.java_20240516.java_2301_吴佳宇_2344310138.String类练习题;
+
+import java.util.Arrays;
+
+public class Main {
+    //**`String` 类练习题**：
+//            1. 字符串连接
+//   - 编写一个程序，连接两个字符串，并输出结果。
+    public static String first(String a, String b) {
+        return a + b;
+    }
+
+    //            2. 字符串长度
+//   - 创建一个方法，接受一个字符串作为参数，返回该字符串的长度。
+    public static int second(String c) {
+        return c.length();
+    }
+
+    //            3. 字符串分割
+//   - 编写一个程序，将一个以逗号分隔的字符串分割成单词数组。
+    public static String[] third(String d) {
+        return d.split(",");
+    }
+
+    //            4. 字符串反转
+//   - 实现一个方法，接受一个字符串作为参数，并返回其反转后的字符串。
+    public static String fourth(String e) {
+        return new StringBuffer(e).reverse().toString();
+    }
+
+    //            5. 字符串大小写转换
+//   - 创建一个方法，将输入的字符串转换为全小写或全大写。
+    public static String fifth(String f, String g) {
+        return "转为大写：" + f.toUpperCase() + ",转为小写：" + g.toLowerCase();
+    }
+
+    //            6. 字符串搜索
+//   - 编写一个程序，检查一个字符串是否包含另一个字符串。
+    public static boolean sixth(String h, String i) {
+        return h.contains(i);
+    }
+
+    //            7. 字符串替换
+//   - 实现一个方法，将字符串中的所有指定字符替换为另一个字符。
+    public static String seventh(String j, char k, char l) {
+        return j.replace(k, l);
+    }
+
+    //            8. 字符串修剪
+//   - 创建一个方法，去除字符串两端的空白字符。
+    public static String eighth(String m) {
+        return m.trim();
+    }
+
+    //            9. 字符串比较
+//   - 编写一个程序，比较两个字符串是否相等，忽略大小写。
+    public static boolean ninth(String n, String o) {
+        return n.equalsIgnoreCase(o);
+    }
+
+    //            10. 子串操作
+//    - 实现一个方法，提取一个字符串中指定范围内的子串。
+    public static String tenth(String p, int q, int r) {
+        return p.substring(q, r);
+    }
+
+    //            11. 字符串结束符检查
+//    - 编写一个程序，检查一个字符串是否以特定的后缀结束。
+    public static boolean eleven(String s, String t) {
+        return s.endsWith(t);
+    }
+
+    //            12. 字符串开始符检查
+//    - 实现一个方法，检查一个字符串是否以特定的前缀开始。
+    public static boolean twelve(String u, String v) {
+        return u.startsWith(v);
+    }
+
+    //            13. 字符串中字符的出现次数
+//    - 编写一个程序，计算一个字符在字符串中出现的次数。
+    public static void thirteen(String w, char x, int y) {
+        w = "abcaa";
+        x = 'a';
+        y = 0;
+        for (int i = 0; i < w.length(); i++) {
+            if (w.charAt(i) == x) {
+                y++;
+            }
+        }
+    }
+
+    //            14. 字符串与数字的转换
+//    - 创建一个方法，将字符串转换为相应的整数或浮点数，反之亦然。
+    public static void fifteen(String z) {
+        System.out.println("字符串转换为整数：" + Integer.parseInt(z) + ",字符串转换为浮点数:" + Double.parseDouble(z));
+    }
+
+    //            15. StringBuilder拼接
+//    - 自定义三个字符串常量，使用 StringBuilder将这三个字符串拼接并输出。
+    public static StringBuilder sixteen(String A, String B, String C) {
+        StringBuilder stringBuilder = new StringBuilder();
+         return stringBuilder.append(A).append(B).append(C);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/JDBC1.java" "b/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/JDBC1.java"
new file mode 100644
index 0000000000000000000000000000000000000000..b93d697e5d9f99a76d309556a4bec47a903d9474
--- /dev/null
+++ "b/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/JDBC1.java"
@@ -0,0 +1,45 @@
+package com.java.minxi.java_20240523.java_2301_吴佳宇_2344310138;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+
+public class JDBC1 {
+    public static void main(String[] args) {
+        Connection conn = null;  //获取执行sql的对象，管理事务
+        Statement stmt = null;   //执行sql语句
+        //1.注册驱动
+        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            //2.获取连接
+            String url = "jdbc:mysql://127.0.0.1:3306/student?serverTimezone=Asia/Shanghai";
+            String username = "root";
+            String password = "123456";
+            conn = DriverManager.getConnection(url,username,password);
+            //3.编写sql
+            String sql = "update student_info set name = '张三' where id = 1;";
+            //4.获取执行sql对象
+            stmt = conn.createStatement();
+            //5.执行sql
+            int count = stmt.executeUpdate(sql);
+            //6.处理结果
+            if (count > 0){
+                System.out.println("修改了" + count + "条数据");
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+        }finally {
+            //7.释放资源
+            try {
+                if (null != conn){
+                    conn.close();
+                }
+                if (null != stmt){
+                    stmt.close();
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git "a/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/JDBC2.java" "b/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/JDBC2.java"
new file mode 100644
index 0000000000000000000000000000000000000000..7cc143ce034d5781cee2963c3a25f31daecee5d6
--- /dev/null
+++ "b/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/JDBC2.java"
@@ -0,0 +1,52 @@
+package com.java.minxi.java_20240523.java_2301_吴佳宇_2344310138;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+public class JDBC2 {
+    public static void main(String[] args) {
+        Connection conn = null;
+        Statement stmt = null;
+        //1.注册驱动
+        try {
+            Class.forName("com.mysql.cj.jdbc.Driver");
+            //2.获取连接
+            String url = "jdbc:mysql://127.0.0.1:3306/student?serverTimezone=Asia/Shanghai";
+            String username = "root";
+            String password = "123456";
+            conn = DriverManager.getConnection(url,username,password);
+            //3.编写sql
+            String sql = "select * from student_info;";
+            //4.获取执行sql对象
+            stmt = conn.createStatement();
+            //5.执行sql
+            ResultSet count = stmt.executeQuery(sql);
+            //6.处理结果
+//            if (count > 0) {
+//                System.out.println("修改了" + count + "条数据");
+//            }
+            //7.拿出数据
+            while (count.next()){
+                int id = count.getInt("id");
+                String name = count.getNString("name");
+                System.out.println(id + " ==》" + name);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            //7.释放资源
+            try{
+                if(null != conn){
+                    conn.close();
+                }
+                if (null != stmt) {
+                    stmt.close();
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git "a/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java" "b/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java"
new file mode 100644
index 0000000000000000000000000000000000000000..297d18259ae15bb66b863c4561dfb2f9961c24d8
--- /dev/null
+++ "b/work/com/java/minxi/java_20240523/java_2301_\345\220\264\344\275\263\345\256\207_2344310138/Student.java"
@@ -0,0 +1,30 @@
+package com.java.minxi.java_20240523.java_2301_吴佳宇_2344310138;
+
+public class Student {
+    private int id;
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Student{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                '}';
+    }
+}