From c2af3e774670f6eccde0ca74cfac54abd279691d Mon Sep 17 00:00:00 2001 From: shuai Date: Tue, 23 Apr 2024 21:52:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/minxi/java_20240420/Electrical.java | 71 +++++++++++++++++++ work/com/java/minxi/java_20240420/Main.java | 8 +++ 2 files changed, 79 insertions(+) create mode 100644 work/com/java/minxi/java_20240420/Electrical.java create mode 100644 work/com/java/minxi/java_20240420/Main.java diff --git a/work/com/java/minxi/java_20240420/Electrical.java b/work/com/java/minxi/java_20240420/Electrical.java new file mode 100644 index 0000000..f4ce86f --- /dev/null +++ b/work/com/java/minxi/java_20240420/Electrical.java @@ -0,0 +1,71 @@ +package com.java.minxi.java_20240420; + +public class Electrical { + public String brand; + public int weight; + public String category; + public Electrical(){ + + } + public Electrical(String brand, int weight, String category) { + this.brand = brand; + this.weight = weight; + this.category = category; + } + public void laundry(){ + System.out.println(this.brand+"正在洗衣服"); + } + public void dinner(){ + System.out.println("做饭"); + } + public void weigh(){ + System.out.println("称重"); + } + public String getBrand(){ + return brand; + } + public void setBrand(String brand){ + this.brand = brand; + } + public int getWeight(){ + return weight; + } + public void setWeight(int weight){ + this.weight = weight; + } + public String getCategory(){ + return category; + } + public void setCategory(String category){ + this.category = category; + } + public class AirConditioner { + public String brand; + public String category; + public void cool(){ + + } + public void heating(){ + + } + public void setBrand(){ + this.brand = brand; + } + public String getBrand() { + return brand; + } + public void setCategory(){ + this.category = category; + } + public String getCategory() { + return category; + } + public AirConditioner() { + + } + public AirConditioner(String brand, String category) { + this.brand = brand; + this.category = category; + } + } +} diff --git a/work/com/java/minxi/java_20240420/Main.java b/work/com/java/minxi/java_20240420/Main.java new file mode 100644 index 0000000..c31a56a --- /dev/null +++ b/work/com/java/minxi/java_20240420/Main.java @@ -0,0 +1,8 @@ +package com.java.minxi.java_20240420; + +public class Main { + public static void main(String[] args) + { + Electrical one = new Electrical(); + } +} -- Gitee From 24e644d00b73ec1af8d2708a8a90d1707dda5562 Mon Sep 17 00:00:00 2001 From: shuai Date: Tue, 23 Apr 2024 23:55:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Electrical.java" | 2 +- .../Main.java" | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) rename work/com/java/minxi/java_20240420/Electrical.java => "work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Electrical.java" (95%) rename work/com/java/minxi/java_20240420/Main.java => "work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" (44%) diff --git a/work/com/java/minxi/java_20240420/Electrical.java "b/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Electrical.java" similarity index 95% rename from work/com/java/minxi/java_20240420/Electrical.java rename to "work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Electrical.java" index f4ce86f..dad7623 100644 --- a/work/com/java/minxi/java_20240420/Electrical.java +++ "b/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Electrical.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240420; +package com.java.minxi.java_20240420.java_2302_李新炜_2344310245; public class Electrical { public String brand; diff --git a/work/com/java/minxi/java_20240420/Main.java "b/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" similarity index 44% rename from work/com/java/minxi/java_20240420/Main.java rename to "work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" index c31a56a..62ffc31 100644 --- a/work/com/java/minxi/java_20240420/Main.java +++ "b/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" @@ -1,4 +1,6 @@ -package com.java.minxi.java_20240420; +package com.java.minxi.java_20240420.java_2302_李新炜_2344310245; + +import com.java.minxi.java_20240420.java_2302_李新炜_2344310245.Electrical; public class Main { public static void main(String[] args) -- Gitee From 706cb17c1e28c398e626f9e7864171d6dc81de3f Mon Sep 17 00:00:00 2001 From: shuai Date: Tue, 23 Apr 2024 23:58:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main.java" | 1 + 1 file changed, 1 insertion(+) diff --git "a/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" "b/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" index 62ffc31..32da689 100644 --- "a/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\346\235\216\346\226\260\347\202\234_2344310245/Main.java" @@ -6,5 +6,6 @@ public class Main { public static void main(String[] args) { Electrical one = new Electrical(); + one.brand = "海尔"; } } -- Gitee