Skip to content

Y
yichengstreet-be
Commit 28cd9cf2 authored by luben's avatar luben
Browse files
Options

Merge branch 'dev-lb' into 'dev' 

fix

See merge request !215
parents 2bebe5c8 70c80ddb
Pipeline #145068 failed with stages
      in 32 minutes and 39 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 5 additions and 5 deletions
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
      View file @ 28cd9cf2
      ...@@ -866,7 +866,7 @@ public class RegionController extends BaseController { ...@@ -866,7 +866,7 @@ public class RegionController extends BaseController {
      return AjaxResult.success(gridRegionList); return AjaxResult.success(gridRegionList);
      } }
      @PreAuthorize("@ss.hasPermi('system:region:remove')") // @PreAuthorize("@ss.hasPermi('system:region:remove')")
      @RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE) @RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE)
      @ResponseBody @ResponseBody
      public AjaxResult deleteTreeNode(@RequestParam(value = "id", required = false) String id, public AjaxResult deleteTreeNode(@RequestParam(value = "id", required = false) String id,
      ...@@ -896,7 +896,7 @@ public class RegionController extends BaseController { ...@@ -896,7 +896,7 @@ public class RegionController extends BaseController {
      return AjaxResult.success(); return AjaxResult.success();
      } }
      @PreAuthorize("@ss.hasPermi('system:region:edit')") // @PreAuthorize("@ss.hasPermi('system:region:edit')")
      @RequestMapping(value = "/changeName",method = RequestMethod.GET) @RequestMapping(value = "/changeName",method = RequestMethod.GET)
      @ResponseBody @ResponseBody
      public AjaxResult changeName(@RequestParam(value = "id", required = false) String id, public AjaxResult changeName(@RequestParam(value = "id", required = false) String id,
      ......
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java
      View file @ 28cd9cf2
      ...@@ -24,7 +24,7 @@ public class HouseResourceController { ...@@ -24,7 +24,7 @@ public class HouseResourceController {
      this.houseResourceService = houseResourceService; this.houseResourceService = houseResourceService;
      } }
      @PreAuthorize("@ss.hasPermi('system:house:add')") // @PreAuthorize("@ss.hasPermi('system:house:add')")
      @PostMapping @PostMapping
      public AjaxResult saveHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) { public AjaxResult saveHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) {
      houseResourceService.saveHouseResource(dto); houseResourceService.saveHouseResource(dto);
      ...@@ -36,14 +36,14 @@ public class HouseResourceController { ...@@ -36,14 +36,14 @@ public class HouseResourceController {
      return AjaxResult.success(houseResourceService.queryHouseResourceById(id)); return AjaxResult.success(houseResourceService.queryHouseResourceById(id));
      } }
      @PreAuthorize("@ss.hasPermi('system:house:edit')") // @PreAuthorize("@ss.hasPermi('system:house:edit')")
      @PutMapping @PutMapping
      public AjaxResult updateHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) { public AjaxResult updateHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) {
      houseResourceService.updateHouseResource(dto); houseResourceService.updateHouseResource(dto);
      return AjaxResult.success(); return AjaxResult.success();
      } }
      @PreAuthorize("@ss.hasPermi('system:house:remove')") // @PreAuthorize("@ss.hasPermi('system:house:remove')")
      @DeleteMapping @DeleteMapping
      public AjaxResult deleteHouseResourceById(@RequestParam String id) { public AjaxResult deleteHouseResourceById(@RequestParam String id) {
      houseResourceService.deleteHouseResourceById(id); houseResourceService.deleteHouseResourceById(id);
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment