Merge branch 'dev-lb' into 'dev'

fix

See merge request !215

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -866,7 +866,7 @@ public class RegionController extends BaseController {
         return AjaxResult.success(gridRegionList);
     }
 
-    @PreAuthorize("@ss.hasPermi('system:region:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:region:remove')")
     @RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE)
     @ResponseBody
     public AjaxResult deleteTreeNode(@RequestParam(value = "id", required = false) String id,
@@ -896,7 +896,7 @@ public class RegionController extends BaseController {
         return AjaxResult.success();
     }
 
-    @PreAuthorize("@ss.hasPermi('system:region:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:region:edit')")
     @RequestMapping(value = "/changeName",method = RequestMethod.GET)
     @ResponseBody
     public AjaxResult changeName(@RequestParam(value = "id", required = false) String id,

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -24,7 +24,7 @@ public class HouseResourceController {
         this.houseResourceService = houseResourceService;
     }
 
-    @PreAuthorize("@ss.hasPermi('system:house:add')")
+//    @PreAuthorize("@ss.hasPermi('system:house:add')")
     @PostMapping
     public AjaxResult saveHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) {
         houseResourceService.saveHouseResource(dto);
@@ -36,14 +36,14 @@ public class HouseResourceController {
         return AjaxResult.success(houseResourceService.queryHouseResourceById(id));
     }
 
-    @PreAuthorize("@ss.hasPermi('system:house:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:house:edit')")
     @PutMapping
     public AjaxResult updateHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) {
         houseResourceService.updateHouseResource(dto);
         return AjaxResult.success();
     }
 
-    @PreAuthorize("@ss.hasPermi('system:house:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:house:remove')")
     @DeleteMapping
     public AjaxResult deleteHouseResourceById(@RequestParam String id) {
         houseResourceService.deleteHouseResourceById(id);