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

Merge branch 'dev.wei' into dev
fix():修改路径冲突导致的报错
2024-10-09 14:22:16 +08:00 · 2024-10-09 14:20:08 +08:00 · 2024-10-09 14:19:39 +08:00
1 changed files with 1 additions and 1 deletions
--- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmPermissionController.java
+++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmPermissionController.java
@ -33,7 +33,7 @@ public class FirmPermissionController {
     * @param firmUpdPermissionReq
     * @return
     */
-    @PostMapping("/updpermission")
+    @PostMapping("/permissionupd")
    @Operation(summary = "修改权限分配",description = "修改权限分配")
    public Result updpermission(@RequestBody FirmUpdPermissionReq firmUpdPermissionReq){
        firmPermissionService.updpermission(firmUpdPermissionReq);
Author	SHA1	Message	Date
WeiRan	2a85b2bb67	Merge remote-tracking branch 'origin/dev' into dev	2024-10-09 14:22:16 +08:00
WeiRan	e172137feb	Merge branch 'dev.wei' into dev	2024-10-09 14:20:08 +08:00
WeiRan	82a7117e22	fix():修改路径冲突导致的报错	2024-10-09 14:19:39 +08:00