From 551db3af0057234f393a4d9d68fb03dec41c6c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E7=91=B6?= <3079802420@qq.com> Date: Sat, 27 Apr 2024 19:59:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E6=8F=90=E4=BA=A4=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student.java" | 2 +- .../student1.java" | 2 +- .../Main.java" | 2 +- .../ele.java" | 2 +- .../Main.java" | 9 +++++++ .../Person.java" | 24 +++++++++++++++++++ 6 files changed, 37 insertions(+), 4 deletions(-) rename "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student.java" => "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student.java" (89%) rename "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student1.java" => "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student1.java" (92%) rename "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/Main.java" => "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" (95%) rename "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/ele.java" => "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/ele.java" (97%) create mode 100644 "work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" create mode 100644 "work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" diff --git "a/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student.java" "b/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student.java" similarity index 89% rename from "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student.java" rename to "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student.java" index 8acaeaa..1966afa 100644 --- "a/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student.java" +++ "b/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240418.java_2302_王梦瑶_3244310232; +package com.java.minxi.java_20240418.java_2302_王梦瑶_2344310232; public class student { int num; diff --git "a/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student1.java" "b/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student1.java" similarity index 92% rename from "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student1.java" rename to "work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student1.java" index c2f1a39..6559410 100644 --- "a/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/student1.java" +++ "b/work/com/java/minxi/java_20240418/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/student1.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240418.java_2302_王梦瑶_3244310232; +package com.java.minxi.java_20240418.java_2302_王梦瑶_2344310232; public class student1 { public static void main(String[] args) { diff --git "a/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/Main.java" "b/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" similarity index 95% rename from "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/Main.java" rename to "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" index 00bc65c..b0b6f0e 100644 --- "a/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/Main.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240420.java_2302_王梦瑶_3244310232; +package com.java.minxi.java_20240420.java_2302_王梦瑶_2344310232; public class Main { public static void main(String[] args) { diff --git "a/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/ele.java" "b/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/ele.java" similarity index 97% rename from "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/ele.java" rename to "work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/ele.java" index 64fd83a..e29fdd2 100644 --- "a/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_3244310232/ele.java" +++ "b/work/com/java/minxi/java_20240420/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/ele.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240420.java_2302_王梦瑶_3244310232; +package com.java.minxi.java_20240420.java_2302_王梦瑶_2344310232; public class ele { //品牌(String)、重量(int)、类别(String)的成员变量； diff --git "a/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" "b/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" new file mode 100644 index 0000000..17308a9 --- /dev/null +++ "b/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" @@ -0,0 +1,9 @@ +package com.java.minxi.java_20240426_java_2302_王梦瑶_2344310232; + +public class Main { + public static void main(String[] args) { + Person.Student student = new Person.Student("张三", 18, "清华大学"); + student.intro(); + + } +} diff --git "a/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" "b/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" new file mode 100644 index 0000000..cd9a3d6 --- /dev/null +++ "b/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" @@ -0,0 +1,24 @@ +package com.java.minxi.java_20240426_java_2302_王梦瑶_2344310232; + +public class Person { + public String name; + public int age; + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public static class Student extends Person { + String school; + + public Student(String name, int age, String school) { + super(name, age); + this.school = school; + } + + public void intro() { + System.out.println("姓名：" + name + "，年龄：" + age + "，学校：" + school + "。"); + } + } +} -- Gitee From 1db86007f08b4a67aef4b9d84e12d69c5bb1a24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E7=91=B6?= <3079802420@qq.com> Date: Sun, 28 Apr 2024 20:28:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../One.java" | 2 +- .../Two.java" | 2 +- .../Main.java" | 2 +- .../Person.java" | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename "work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" => "work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" (96%) rename "work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" => "work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" (79%) rename "work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" => "work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" (74%) rename "work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" => "work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" (89%) diff --git "a/work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" "b/work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" similarity index 96% rename from "work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" rename to "work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" index 140253b..cf7b0dd 100644 --- "a/work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" +++ "b/work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/One.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240425_java_2302_王梦瑶_2344310232; +package com.java.minxi.java_20240425.java_2302_王梦瑶_2344310232; public class One { private long ID ; diff --git "a/work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" "b/work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" similarity index 79% rename from "work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" rename to "work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" index f506ada..4506123 100644 --- "a/work/com/java/minxi/java_20240425_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" +++ "b/work/com/java/minxi/java_20240425/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Two.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240425_java_2302_王梦瑶_2344310232; +package com.java.minxi.java_20240425.java_2302_王梦瑶_2344310232; import java.util.Scanner; diff --git "a/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" "b/work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" similarity index 74% rename from "work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" rename to "work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" index 17308a9..8b58275 100644 --- "a/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" +++ "b/work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Main.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240426_java_2302_王梦瑶_2344310232; +package com.java.minxi.java_20240426.java_2302_王梦瑶_2344310232; public class Main { public static void main(String[] args) { diff --git "a/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" "b/work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" similarity index 89% rename from "work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" rename to "work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" index cd9a3d6..c4eb84f 100644 --- "a/work/com/java/minxi/java_20240426_java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" +++ "b/work/com/java/minxi/java_20240426/java_2302_\347\216\213\346\242\246\347\221\266_2344310232/Person.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240426_java_2302_王梦瑶_2344310232; +package com.java.minxi.java_20240426.java_2302_王梦瑶_2344310232; public class Person { public String name; -- Gitee