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

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/edgeLibrary/ShelvesController.java

@@ -17,10 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -81,7 +78,7 @@ public class ShelvesController extends SuperCacheController<ShelvesService, Long
     }
 
     @ApiOperation(value = "删除仓库类型", notes = "删除仓库类型")
-    @PostMapping("/delete")
+    @RequestMapping(value = "/check", method = RequestMethod.POST)
     public R<Boolean> delete(@RequestBody Shelves model) {
         // 这个操作相当的危险，请谨慎操作！！!
         return success(baseService.delete(model));

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/edgeLibrary/StorgeController.java

@@ -20,10 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -86,7 +83,7 @@ public class StorgeController extends SuperCacheController<StorgeService, Long,
     }
 
     @ApiOperation(value = "检测库位是否存在", notes = "检测库位是否存在")
-    @PostMapping("/check/")
+    @RequestMapping(value = "/check", method = RequestMethod.POST)
     public R<Boolean> check(@RequestBody StorgeSaveDTO model) {
         return success(baseService.check(model));
     }