Merge remote-tracking branch 'origin/main'

ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysExchangePeriodController.java

@@ -40,7 +40,7 @@ public class EbikeSysExchangePeriodController {
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
     @PostMapping("remove")
-    public JsonResult<?> remove(@PathVariable String id) {
+    public JsonResult<?> remove(@PathVariable("id") String id) {
         boolean r = ebikeSysExchangePeriodService.removeById(id);
         return r? JsonResult.success() : JsonResult.failed("删除区域分时间段换电失败");
     }

ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java

@@ -114,7 +114,7 @@ public class EbikeUserOrdersController {
      * @ 用户订单表详情
      */
     @GetMapping("getInfo/{id}")
-    public JsonResult<?> getInfo(@PathVariable String id) {
+    public JsonResult<?> getInfo(@PathVariable("id") String id) {
         UserOrders userOrders = userOrdersService.getById(id);
         return JsonResult.success(userOrders);
     }

ebike-user/src/main/java/com/cdzy/user/controller/OrganizationsController.java

@@ -41,7 +41,7 @@ public class OrganizationsController {
      * @return {@code 200} 删除成功，{@code 500} 删除失败
      */
     @DeleteMapping("remove/{id}")
-    public JsonResult<?> remove(@PathVariable Long id) {
+    public JsonResult<?> remove(@PathVariable("id") Long id) {
         organizationsService.removeById(id);
         return JsonResult.success();
     }
@@ -75,7 +75,7 @@ public class OrganizationsController {
      * @return 详情
      */
     @GetMapping("getInfo/{id}")
-    public JsonResult<?> getInfo(@PathVariable Long id) {
+    public JsonResult<?> getInfo(@PathVariable("id") Long id) {
         return JsonResult.success(organizationsService.getById(id));
     }
 

ebike-user/src/main/java/com/cdzy/user/controller/PermissionsController.java

@@ -47,7 +47,7 @@ public class PermissionsController {
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
     @DeleteMapping("remove/{id}")
-    public JsonResult<?> remove(@PathVariable Long id) {
+    public JsonResult<?> remove(@PathVariable("id") Long id) {
         permissionsService.removeById(id);
         return JsonResult.success();
     }
@@ -82,7 +82,7 @@ public class PermissionsController {
      * @return 详情
      */
     @GetMapping("getInfo/{id}")
-    public JsonResult<?> getInfo(@PathVariable Long id) {
+    public JsonResult<?> getInfo(@PathVariable("id") Long id) {
         Permissions info = permissionsService.getById(id);
         return JsonResult.success(info);
     }

ebike-user/src/main/java/com/cdzy/user/controller/RolePermissionsController.java

@@ -42,7 +42,7 @@ public class RolePermissionsController {
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
     @DeleteMapping("remove/{id}")
-    public JsonResult<?> remove(@PathVariable Long id) {
+    public JsonResult<?> remove(@PathVariable("id") Long id) {
         rolePermissionsService.removeById(id);
         return JsonResult.success();
     }
@@ -77,7 +77,7 @@ public class RolePermissionsController {
      * @return 详情
      */
     @GetMapping("getInfo/{id}")
-    public JsonResult<?> getInfo(@PathVariable Long id) {
+    public JsonResult<?> getInfo(@PathVariable("id") Long id) {
         RolePermissions info = rolePermissionsService.getById(id);
         return JsonResult.success(info);
     }

ebike-user/src/main/java/com/cdzy/user/controller/RolesController.java

@@ -47,7 +47,7 @@ public class RolesController {
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
     @DeleteMapping("remove/{id}")
-    public JsonResult<?> remove(@PathVariable Long id) {
+    public JsonResult<?> remove(@PathVariable("id") Long id) {
         rolesService.removeById(id);
         return JsonResult.success();
     }
@@ -82,7 +82,7 @@ public class RolesController {
      * @return 详情
      */
     @GetMapping("getInfo/{id}")
-    public JsonResult<?> getInfo(@PathVariable Long id) {
+    public JsonResult<?> getInfo(@PathVariable("id") Long id) {
         Roles roles = rolesService.getById(id);
         return JsonResult.success(roles);
     }

ebike-user/src/main/java/com/cdzy/user/controller/StaffController.java

@@ -56,7 +56,7 @@ public class StaffController {
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
     @DeleteMapping("remove/{id}")
-    public JsonResult<?> remove(@PathVariable Long id) {
+    public JsonResult<?> remove(@PathVariable("id") Long id) {
         staffService.removeById(id);
         return JsonResult.success();
     }
@@ -91,7 +91,7 @@ public class StaffController {
      * @return 详情
      */
     @GetMapping("getInfo/{id}")
-    public JsonResult<?>  getInfo(@PathVariable Long id) {
+    public JsonResult<?>  getInfo(@PathVariable("id") Long id) {
         Staff staff = staffService.getById(id);
         return JsonResult.success(staff);
     }

ebike-user/src/main/java/com/cdzy/user/controller/StaffRolesController.java

@@ -53,7 +53,7 @@ public class StaffRolesController {
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
     @DeleteMapping("remove/{id}")
-    public JsonResult<?> remove(@PathVariable Long id) {
+    public JsonResult<?> remove(@PathVariable("id") Long id) {
         staffRolesService.removeById(id);
         return JsonResult.success();
     }
@@ -88,7 +88,7 @@ public class StaffRolesController {
      * @return 详情
      */
     @GetMapping("getInfo/{id}")
-    public JsonResult<?> getInfo(@PathVariable Long id) {
+    public JsonResult<?> getInfo(@PathVariable("id") Long id) {
         StaffRoles info = staffRolesService.getById(id);
         return JsonResult.success(info);
     }