Merge branch 'dev-鲍德' into develop

# Conflicts:
#	censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/SysMenu1AppController.java

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerRoomController.java

@@ -31,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2023-06-26
  */
 @RestController
-@RequestMapping("/system/ledger/room")
+@RequestMapping("/app-api/ledger/room","/system/ledger/room")
 public class LedgerRoomController extends BaseController
 {
     @Autowired
@@ -40,7 +40,6 @@ public class LedgerRoomController extends BaseController
     /**
      * 查询基础数据-楼层列表
      */
-    @PreAuthorize("@ss.hasPermi('system:ledgerRoom:list')")
     @GetMapping("/list")
     public TableDataInfo list(LedgerRoom ledgerRoom)
     {
@@ -54,7 +53,6 @@ public class LedgerRoomController extends BaseController
     /**
      * 导出基础数据-楼层列表
      */
-    @PreAuthorize("@ss.hasPermi('system:ledgerRoom:export')")
     @Log(title = "基础数据-楼层", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, LedgerRoom ledgerRoom)
@@ -68,7 +66,6 @@ public class LedgerRoomController extends BaseController
     /**
      * 获取基础数据-楼层详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:ledgerRoom:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -78,7 +75,6 @@ public class LedgerRoomController extends BaseController
     /**
      * 新增基础数据-楼层
      */
-    @PreAuthorize("@ss.hasPermi('system:ledgerRoom:add')")
     @Log(title = "基础数据-楼层", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     public AjaxResult add(@RequestBody LedgerRoom ledgerRoom)
@@ -89,7 +85,6 @@ public class LedgerRoomController extends BaseController
     /**
      * 修改基础数据-楼层
      */
-    @PreAuthorize("@ss.hasPermi('system:ledgerRoom:edit')")
     @Log(title = "基础数据-楼层", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public AjaxResult edit(@RequestBody LedgerRoom ledgerRoom)
@@ -100,7 +95,6 @@ public class LedgerRoomController extends BaseController
     /**
      * 删除基础数据-楼层
      */
-    @PreAuthorize("@ss.hasPermi('system:ledgerRoom:remove')")
     @Log(title = "基础数据-楼层", businessType = BusinessType.DELETE)
 	@PostMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/SysMenu1AppController.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/SysMenuAppController.java

@@ -22,9 +22,9 @@ import java.util.List;
  * 
  * @author ruoyi
  */
-@RestController
+@RestController("SysMenuAppController2")
 @RequestMapping("/app-api/menu1")
-public class SysMenu1AppController extends BaseController
+public class SysMenuAppController extends BaseController
 {
     @Autowired
     private ISysMenuService menuService;