Merge remote-tracking branch 'origin/1.0' into 1.0

src/main/java/com/galaxis/manatee/controller/GetController.java

@@ -7,6 +7,7 @@ import com.galaxis.manatee.service.ChuanyunService;
 import com.galaxis.manatee.task.ChuanyunBasicDataScheduledTask;
 import com.galaxis.manatee.task.ChuanyunHumanResourceScheduledTask;
 import com.galaxis.manatee.util.ExcelUtils;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSON;
 import net.sf.json.JSONObject;
@@ -148,7 +149,7 @@ public class GetController {
     @PostMapping("/test/updateEquipment")
     public void updateEquipment(@RequestBody ChuanyunOperationInformationDO chuanyunOperationInformationDO){
         chuanyunService.updateOperationInformation(chuanyunOperationInformationDO);
-    };
+    }
 
 //    @GetMapping("/test/updateMember")
 //    public void updateMember(){

src/main/java/com/galaxis/manatee/controller/TestController.java

@@ -0,0 +1,33 @@
+package com.galaxis.manatee.controller;
+
+import lombok.Data;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/10/27 11:39 上午
+ */
+@RestController
+public class TestController {
+
+
+    @GetMapping("/test/helloGet")
+    public String testGet(){
+        return "hello";
+    }
+
+    @PostMapping("/test/helloPost")
+    public String testPost(@RequestBody PostObject postObject){
+        return "hello";
+    }
+
+    @Data
+    class PostObject{
+        private String a;
+        private String b;
+    }
+}