diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/AirPlane.java" "b/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/AirPlane.java"
deleted file mode 100644
index 173c1df2425034206e5d82af218b654977604048..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/AirPlane.java"
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_刘天睿_2344310234;
-public class AirPlane extends org.example.Vehicles {
-    String a;
-    String b;
-    String c;
-    String d;
-
-    public void travel(String type, String brand, String color, String place) {
-
-        this.a=type;
-        this.b=brand;
-        this.c=color;
-        this.d=place;
-        System.out.println( "坐着"+ combination(b,c)+getType()+"前往"+getPlace()+"旅游");
-
-    }
-    public void travel(String type, String brand,  String place) {
-        this.a=type;
-        this.b=brand;
-        this.d=place;
-
-        System.out.println( "坐着"+ combination(b)+getType()+"前往"+getPlace()+"旅游");
-    }
-
-    public String combination(String brand, String color) {
-        String a = null;
-        a=brand+color;
-        return a;
-
-
-    }
-
-    public String combination(String brand) {
-        return brand;
-    }
-
-}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Car.java" "b/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Car.java"
deleted file mode 100644
index 4af97baff66b67294848f624b874cf79c782abdd..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Car.java"
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_刘天睿_2344310234;
-
-public class Car extends org.example.Vehicles {
-
-
-    String a;
-    String b;
-    String c;
-    String d;
-
-    public void travel(String type, String brand, String color, String place) {
-
-        this.a=type;
-        this.b=brand;
-        this.c=color;
-        this.d=place;
-        System.out.println( "开着"+ combination(b,c)+getType()+"前往"+getPlace()+"旅游");
-
-    }
-    public void travel(String type, String brand,  String place) {
-        this.a=type;
-        this.b=brand;
-        this.d=place;
-
-        System.out.println( "开着"+ combination(b)+getType()+"前往"+getPlace()+"旅游");
-    }
-
-    public String combination(String brand, String color) {
-        String a = null;
-        a=brand+color;
-        return a;
-
-
-    }
-
-    public String combination(String brand) {
-        return brand;
-    }
-
-}
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" "b/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
deleted file mode 100644
index 940924341e27fdad521bf1220782208212d1e25c..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.java.minxi.java_20240508.java_2302_刘天睿_2344310234;
-
-public class Main {
-
-
-    public static void main(String[] args) {
-
-        Car u1 = new Car();
-        u1.setBrand("大众");
-        u1.setColor("白色");
-        u1.setPlace("北京");
-        u1.setType("汽车");
-        u1.travel(u1.getType(), u1.getBrand(), u1.getColor(), u1.getPlace());
-        Car u2 = new Car();
-        u2.setBrand("奔驰");
-        u2.setPlace("东山岛");
-        u2.setType("汽车");
-        u2.travel(u2.getType(), u2.getBrand(), u2.getPlace());
-        AirPlane u3 = new AirPlane();
-        u3.setBrand("波音");
-        u3.setColor("蓝色");
-        u3.setPlace("大理");
-        u3.setType("客机");
-        u3.travel(u3.getType(), u3.getBrand(), u3.getColor(), u3.getPlace());
-        AirPlane u4 = new AirPlane();
-        u4.setBrand("空客");
-
-        u4.setPlace("哈尔滨岛");
-        u4.setType("客机");
-        u4.travel(u4.getType(), u4.getBrand(), u4.getPlace());
-
-
-    }
-}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Vehicles.java" "b/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Vehicles.java"
deleted file mode 100644
index 2d785c5bfa54fa367237d2905fd7f4e3ecfae988..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240508/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Vehicles.java"
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.example;
-
-public class Vehicles {
-    private String type;
-    private String brand;
-    private String color;
-    private String place;
-
-    public Vehicles() {
-    }
-
-    public Vehicles(String type, String brand, String color, String 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(String place) {
-        this.place = place;
-    }
-    public void travel(){
-
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bus.java"
deleted file mode 100644
index 4463c9c1b16a7fe739b475e8afc4614d61be1e09..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bus.java"
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-public class Bus extends MotorVehicles {
-
-
-    @Override
-    public void brake(String t,String c) {
-        String name="巴士";
-        controlAirTemperature(t,name);
-        charge(c,name);
-
-
-
-
-
-    }
-
-    @Override
-    public void controlAirTemperature(String c, String name) {
-
-            System.out.println(name+"使用的刹车技术："+c+"\n");
-
-    }
-
-    @Override
-    public void charge(String t, String name) {
-        if (t.equals("2")){
-            System.out.println(name+":"+t+"/张,不计算公里数");
-        }else {System.out.println(name+":"+t+"/元,起步价3公里");}
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/ContrlTemerature.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/ContrlTemerature.java"
deleted file mode 100644
index ff467ef759e12bba671f493f9776bc94fb118fed..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/ContrlTemerature.java"
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-public interface ContrlTemerature {
-    public  void controlAirTemperature(String t, String name);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
deleted file mode 100644
index 584f618510f7c84bf4a117c35909e9013279bdcc..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java"
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-
-import java.util.Scanner;
-
-public class Main {
-    public static void main(String[] args) {
-        String s;
-        String f;
-        String p;
-        String v;
-        Scanner uu = new Scanner(System.in);
-        System.out.println("g刹车：");
-        s = uu.next();
-        System.out.println("g票价：");
-        f = uu.next();
-        System.out.println("g刹车：");
-        p = uu.next();
-        System.out.println("g票价：");
-        v = uu.next();
-
-        MotorVehicles oo = new Bus();
-        oo.brake(s, f);
-
-        MotorVehicles ii = new Taxi();
-        ii.brake(p, v);
-
-
-    }
-}
\ No newline at end of file
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MoneyFare.java"
deleted file mode 100644
index caa5e186c97fb87e241730a5304b4304ab8eaa3a..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MoneyFare.java"
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-
-public interface MoneyFare {
-    public void charge(String c,String name);
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MotorVehicles.java"
deleted file mode 100644
index 578cd20883d6000bed848ba60a4b8beef0b009d7..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/MotorVehicles.java"
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-public abstract class MotorVehicles implements ContrlTemerature,MoneyFare {
-    public  void brake(String t,String c){
-        String name;
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Taxi.java"
deleted file mode 100644
index 5c40b4493a8998cb5df5b393d65609da3e775324..0000000000000000000000000000000000000000
--- "a/work/com/java/minxi/java_20240509/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Taxi.java"
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.java.minxi.java_20240509.java_2302_刘天睿_2344310234;
-
-
-public class Taxi extends MotorVehicles {
-
-    public void brake(String t,String c) {
-        String name="出租车";
-        controlAirTemperature(t,name);
-        charge(c,name);
-
-
-
-
-
-    }
-
-
-    public void controlAirTemperature(String t, String name) {
-
-        System.out.println(name+"使用的刹车技术："+t+"\n");
-
-    }
-
-
-    public void charge(String c, String name) {
-        if (c.equals("2")){
-            System.out.println(name+":"+c+"/张,不计算公里数");
-        }else {System.out.println(name+":"+c+"/元,起步价3公里");}
-    }
-}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
new file mode 100644
index 0000000000000000000000000000000000000000..b38369bd9300f468dd8613c62566b8ce8307083e
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Bus.java"
@@ -0,0 +1,13 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public class Bus extends MotorVehicles implements MoneyFare {
+    @Override
+    public void charge(String c) {
+        System.out.println("公共汽车使用的刹车技术:"+c);
+    }
+
+    @Override
+    public void brake(String s) {
+        System.out.println("公共汽车:"+s+"元/张,不计算公里数");
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
new file mode 100644
index 0000000000000000000000000000000000000000..b3b5a7d426e98e006efa4fb23ec72f12236e0f05
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/ControlTemperature.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface ControlTemperature {
+    public void controlAirTemperature(String t);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
new file mode 100644
index 0000000000000000000000000000000000000000..6453c590e8c7e2ee0e8bfe54e751740bf82f3b56
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MainText.java"
@@ -0,0 +1,28 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+import java.util.Scanner;
+
+public class MainText {
+    public static void main(String[] args) {
+        Scanner a = new Scanner(System.in);
+        //公交车
+        System.out.println("请输人公交车采用的刹车技术和车票价(元):");
+        String busA = a.next();
+        String busB = a.next();
+
+        //出租车
+        System.out.println("请输入出租车采用的刹车技术、车票价(元)、安装的空调样式:");
+        String taxiA = a.next();
+        String taxiB = a.next();
+        String taxiC = a.next();
+
+        Bus bus = new Bus();
+        bus.charge(busA);
+        bus.brake(busB);
+
+        Taxi taxi = new Taxi();
+        taxi.controlAirTemperature(taxiA);
+        taxi.charge(taxiB);
+        taxi.brake(taxiC);
+    }
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
new file mode 100644
index 0000000000000000000000000000000000000000..98d1775424e86227b033ca69dc075229be2191b8
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MoneyFare.java"
@@ -0,0 +1,5 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public interface MoneyFare {
+    public void charge(String c);
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
new file mode 100644
index 0000000000000000000000000000000000000000..9769d65d07662e8e7b26ad27f90eba2298a9893a
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/MotorVehicles.java"
@@ -0,0 +1,6 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+public abstract class MotorVehicles {
+    public abstract void brake(String s);
+
+}
diff --git "a/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java" "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
new file mode 100644
index 0000000000000000000000000000000000000000..826c8d247e70f951872ee6bcba0fd7ca36db274e
--- /dev/null
+++ "b/work/com/java/minxi/java_20240509/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Taxi.java"
@@ -0,0 +1,18 @@
+package com.java.minxi.java_20240509.java_2302_郭子懿_2344310236;
+
+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+"空调");
+    }
+}