Merge branch 'master' into zt

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/DepartmentController.java

@@ -9,10 +9,6 @@ import com.judong.chuanyiserver.util.Blank;
 import com.judong.chuanyiserver.util.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -121,4 +117,9 @@ public class DepartmentController {
     }
 
 
+    public static void main(String[] args) {
+
+    }
+
+
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/MenuController.java

@@ -91,7 +91,7 @@ public class MenuController {
      * @param id
      * @return
      */
-    @PostMapping("/deleteMenuById")
+    @GetMapping("/deleteMenuById")
     @PermissionControl
     @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.MENU, OperationEnum = OperationEnum.DELETE)
     public Result deleteMenuById(Integer id) {