From bd5a20b482dff8970d97f266f612828c7eda44a4 Mon Sep 17 00:00:00 2001
From: Lenovo <06290730@163.com>
Date: Thu, 15 Jul 2021 10:52:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fixed=20:=20=E6=B5=8B=E8=AF=95=20=E5=BE=90?=
 =?UTF-8?q?=E7=91=9E=E6=95=8FTask1=20Task2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/swpu/xuruimin/Task1.java    | 23 ++++++++++
 .../main/java/com/swpu/xuruimin/Task2.java    | 45 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java
 create mode 100644 java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java

diff --git a/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java
new file mode 100644
index 0000000..463c9c9
--- /dev/null
+++ b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java
@@ -0,0 +1,23 @@
+package com.swpu.xuruimin;
+
+public class Task1 {
+
+    public static void main(String[] args) {
+        Task2 task2 = new Task2();
+
+        var add = task2.Add(2,3);
+        System.out.println("add = " + add);
+
+        task2.Multi(3,4);
+
+        var t = task2.Try("hhhhhhhhhhhh");
+        System.out.println("try = " + t);
+
+        var list = task2.List();
+        System.out.println("list : " + list);
+
+        var map = task2.Map();
+        System.out.println("map : "+ map);
+    }
+}
+
diff --git a/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java
new file mode 100644
index 0000000..b44a622
--- /dev/null
+++ b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java
@@ -0,0 +1,45 @@
+package com.swpu.xuruimin;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class Task2 {
+
+    public int Add(int a, int b){
+        var y = a + b;
+        return y;
+    }
+
+    public void Multi(int a, int b){
+        var y = a * b;
+        System.out.println("y = a * b = "+ y);
+    }
+
+    public String Try(String string){
+        var y = "hello world!"+string;
+        return y;
+    }
+
+    public List<String> List(){
+        var list = new ArrayList<String>();
+
+        list.add("香蕉");
+        list.add("苹果");
+        list.add("牛奶");
+
+        return list;
+    }
+
+    public Map<String,String> Map(){
+        var map = new HashMap<String,String>();
+        var list = List();
+
+        for(var i = 1;i<=list.size();i++){
+            map.put(list.get(i-1),i * 2 + "");
+        }
+        return map;
+
+    }
+}
-- 
Gitee


From 7d35d9e2a1b887799b176b413d2622c8690661a9 Mon Sep 17 00:00:00 2001
From: Lenovo <06290730@163.com>
Date: Thu, 15 Jul 2021 11:23:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E6=B5=8B=E8=AF=95=20=E5=BE=90?=
 =?UTF-8?q?=E7=91=9E=E6=95=8FTask1=20Task2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/swpu/xuruimin/Task1.java               | 5 +++++
 .../src/main/java/com/swpu/xuruimin/Task2.java               | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java
index 463c9c9..12fc34d 100644
--- a/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java
+++ b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task1.java
@@ -5,17 +5,22 @@ public class Task1 {
     public static void main(String[] args) {
         Task2 task2 = new Task2();
 
+        //有返回值
         var add = task2.Add(2,3);
         System.out.println("add = " + add);
 
+        //无返回值
         task2.Multi(3,4);
 
+        //String
         var t = task2.Try("hhhhhhhhhhhh");
         System.out.println("try = " + t);
 
+        //list
         var list = task2.List();
         System.out.println("list : " + list);
 
+        //map
         var map = task2.Map();
         System.out.println("map : "+ map);
     }
diff --git a/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java
index b44a622..1a4adfa 100644
--- a/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java
+++ b/java-base-projects-task/src/main/java/com/swpu/xuruimin/Task2.java
@@ -7,21 +7,25 @@ import java.util.Map;
 
 public class Task2 {
 
+    //有返回值
     public int Add(int a, int b){
         var y = a + b;
         return y;
     }
 
+    //无返回值
     public void Multi(int a, int b){
         var y = a * b;
         System.out.println("y = a * b = "+ y);
     }
 
+    //String，有返回值
     public String Try(String string){
         var y = "hello world!"+string;
         return y;
     }
 
+    //list
     public List<String> List(){
         var list = new ArrayList<String>();
 
@@ -32,6 +36,7 @@ public class Task2 {
         return list;
     }
 
+    //Map
     public Map<String,String> Map(){
         var map = new HashMap<String,String>();
         var list = List();
-- 
Gitee