From 2f508265973b30fd307b52a6a9cea95fbbcebc20 Mon Sep 17 00:00:00 2001 From: Administrator <2977566312@qq.com> Date: Tue, 23 Apr 2024 20:15:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zuoye.java" | 90 +++++++++++++++++++ .../zuoye2.java" | 25 ++++++ 2 files changed, 115 insertions(+) create mode 100644 "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" create mode 100644 "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" diff --git "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" "b/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" new file mode 100644 index 0000000..b448cd6 --- /dev/null +++ "b/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" @@ -0,0 +1,90 @@ +package java_20240420.java_2302_郭子懿_2344310236; + +public class zuoye { + String pz; + int zl; + String lx; + + public static class bh{ + String pz; + String lx; + + public bh(){ + + } + + public bh(String pz,String lx){ + this.pz = pz; + this.lx = lx; + } + + public String getPz(){ + return pz; + } + + public void setPz(String pz){ + this.pz =pz; + } + + public String getLx(){ + return lx; + } + + public void setLx(String lx){ + this.lx = lx; + } + + public void hot(){ + System.out.println(this.pz+this.lx+"正在预热"); + } + public void cold(){ + System.out.println(this.pz+this.lx+"正在制冷"); + } + + } + + public chuang(){ + } + + public chuang(String pz,int zl,String lx){ + this.pz = pz; + this.zl = zl; + this.lx = lx; + } + + public String getPz(){ + return pz; + } + + public void setPz(String pz){ + this.pz = pz; + } + + public int getZl(){ + return zl; + } + + public void setZl(int zl){ + this.zl = zl; + } + + public String getLx(){ + return lx; + } + + public void setLx(String lx){ + this.lx = lx; + } + + public void x(){ + System.out.println(this.pz+this.lx+"正在洗衣服"); + } + + public void zf(){ + System.out.println(this.pz+this.lx+"正在炖鸡汤"); + } + + public void zl(){ + System.out.println(this.pz+this.lx+"有"+this.zl+"kg重"); + } +} diff --git "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" "b/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" new file mode 100644 index 0000000..d60983f --- /dev/null +++ "b/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" @@ -0,0 +1,25 @@ +package java_20240420.java_2302_郭子懿_2344310236; + +public class zuoye2 { + public static void main(String[] args) { + chuang xyj = new chuang(); + xyj.pz ="海尔"; + xyj.lx ="洗衣机"; + xyj.x(); + chuang dfg = new chuang(); + dfg.pz ="美的"; + dfg.lx ="电饭锅"; + dfg.zf(); + chuang bx = new chuang(); + bx.pz ="海尔"; + bx.lx ="冰箱"; + bx.zl =50; + bx.zl(); + chuang.bh kt = new zuoye.bh(); + kt.pz ="大金"; + kt.lx ="空调"; + kt.cold(); + + System.out.println("-"); + } +} -- Gitee From 4c25e5e1da404d867ef84da4bf29ee21fa0ac9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=AD=90=E6=87=BF?= <2977566312@qq.com> Date: Tue, 23 Apr 2024 12:18:59 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20work?= =?UTF-8?q?/com/java/minxi/java=5F20240418/java=5F2302=5F=E9=83=AD?= =?UTF-8?q?=E5=AD=90=E6=87=BF=5F2344310236/Student.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Student.java" | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student.java" diff --git "a/work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student.java" "b/work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student.java" deleted file mode 100644 index 7e3bcf0..0000000 --- "a/work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student.java" +++ /dev/null @@ -1,24 +0,0 @@ -package com.java.minxi.java_20240418.java_2302_郭子懿_2344310236; - -public class Student { - int id; - String name; - int age; - String sex; -public Student(int id, String name, int age, String sex){ - this.id=id; - this.name=name; - this.age=age; - this.sex=sex; -} - - public void run(){ - System.out.println("张三在跑步"); - } - public void eat(){ - System.out.println("李四在吃饭"); - } - public void sleep(){ - System.out.println("王丽在睡觉"); - } -} -- Gitee From 832e43f64d17b10bb27ffceb0d80cffb2897743e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=AD=90=E6=87=BF?= <2977566312@qq.com> Date: Tue, 23 Apr 2024 12:19:10 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20work?= =?UTF-8?q?/com/java/minxi/java=5F20240418/java=5F2302=5F=E9=83=AD?= =?UTF-8?q?=E5=AD=90=E6=87=BF=5F2344310236/Student2.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Student2.java" | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student2.java" diff --git "a/work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student2.java" "b/work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student2.java" deleted file mode 100644 index e0dda27..0000000 --- "a/work/com/java/minxi/java_20240418/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/Student2.java" +++ /dev/null @@ -1,21 +0,0 @@ -package com.java.minxi.java_20240418.java_2302_郭子懿_2344310236; - -public class Student2 { - public static void main(String[] args) { - Student[] st = new Student[3]; - Student s1 = new Student(1,"张三",21,"男"); - Student s2 = new Student(2,"李四",25,"男"); - Student s3 = new Student(3,"王丽",19,"女"); - st[0] = s1; - st[1] = s2; - st[2] = s3; - - System.out.println(s1.id + " "+s1.name+" "+s1.age+" "+s1.sex+" "); - System.out.println(s2.id + " "+s2.name+" "+s2.age+" "+s2.sex+" "); - System.out.println(s3.id + " "+s3.name+" "+s3.age+" "+s3.sex+" "); - - s1.run(); - s2.eat(); - s3.sleep(); - } -} -- Gitee From 0cb38b2f943ae80f499298d931c731da75033033 Mon Sep 17 00:00:00 2001 From: Administrator <2977566312@qq.com> Date: Wed, 24 Apr 2024 15:46:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainTest.java" | 8 -------- .../zuoye.java" | 2 +- .../zuoye2.java" | 4 +++- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" rename "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" => "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" (95%) rename "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" => "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" (78%) diff --git "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" "b/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" deleted file mode 100644 index fdbea2f..0000000 --- "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" +++ /dev/null @@ -1,8 +0,0 @@ -package com.java.minxi.java_20240415.java_2302_张三_2000212322; - -public class MainTest { - - public static void main(String[] args) { - System.out.println("Hello World"); - } -} \ No newline at end of file diff --git "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" similarity index 95% rename from "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" rename to "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" index b448cd6..70d9b89 100644 --- "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" @@ -1,4 +1,4 @@ -package java_20240420.java_2302_郭子懿_2344310236; +package com.java.minxi.java_20240420.java_2302_郭子懿_2344310236; public class zuoye { String pz; diff --git "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" similarity index 78% rename from "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" rename to "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" index d60983f..63aa0eb 100644 --- "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" @@ -1,4 +1,6 @@ -package java_20240420.java_2302_郭子懿_2344310236; +package com.java.minxi.java_20240420.java_2302_郭子懿_2344310236; + +import com.java.minxi.java_20240420.java_2302_郭子懿_2344310236.zuoye; public class zuoye2 { public static void main(String[] args) { -- Gitee From 43f86ef389a14499ff38e6370c3dbf48cb85c164 Mon Sep 17 00:00:00 2001 From: Administrator <2977566312@qq.com> Date: Wed, 24 Apr 2024 15:46:44 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainTest.java" | 8 -------- .../zuoye.java" | 2 +- .../zuoye2.java" | 4 +++- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 "work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" rename "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" => "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" (95%) rename "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" => "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" (78%) diff --git "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" "b/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" deleted file mode 100644 index fdbea2f..0000000 --- "a/work/com/java/minxi/java_20240415/java_2302_\345\274\240\344\270\211_2000212322/MainTest.java" +++ /dev/null @@ -1,8 +0,0 @@ -package com.java.minxi.java_20240415.java_2302_张三_2000212322; - -public class MainTest { - - public static void main(String[] args) { - System.out.println("Hello World"); - } -} \ No newline at end of file diff --git "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" similarity index 95% rename from "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" rename to "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" index b448cd6..70d9b89 100644 --- "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye.java" @@ -1,4 +1,4 @@ -package java_20240420.java_2302_郭子懿_2344310236; +package com.java.minxi.java_20240420.java_2302_郭子懿_2344310236; public class zuoye { String pz; diff --git "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" similarity index 78% rename from "work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" rename to "work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" index d60983f..63aa0eb 100644 --- "a/work/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\351\203\255\345\255\220\346\207\277_2344310236/zuoye2.java" @@ -1,4 +1,6 @@ -package java_20240420.java_2302_郭子懿_2344310236; +package com.java.minxi.java_20240420.java_2302_郭子懿_2344310236; + +import com.java.minxi.java_20240420.java_2302_郭子懿_2344310236.zuoye; public class zuoye2 { public static void main(String[] args) { -- Gitee From 623807397e4fcef4ab7fb8c0e853f034f5b8de01 Mon Sep 17 00:00:00 2001 From: Administrator <2977566312@qq.com> Date: Wed, 24 Apr 2024 15:53:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- java2302.iml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 java2302.iml diff --git a/java2302.iml b/java2302.iml new file mode 100644 index 0000000..bff56e4 --- /dev/null +++ b/java2302.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file -- Gitee