UserAccount(update)

cms-common/cms-common-util/src/main/java/com/mmc/iuav/general/CodeUtil.java

@@ -36,7 +36,6 @@ public class CodeUtil {
 
     public static String getNewEquipmentNo(String equipmentType, String equipmentNo) {
         String newEquipmentNo = "A" + "0001";
-
         if (equipmentNo != null && !equipmentNo.isEmpty()) {
             int newEquipment = Integer.parseInt(equipmentNo.substring(1)) + 1;
             newEquipmentNo = String.format(equipmentType + "%04d", newEquipment);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserAccountController.java

@@ -3,7 +3,6 @@ package com.mmc.iuav.user.controller;
 import com.mmc.iuav.group.Page;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
-import com.mmc.iuav.user.model.dto.RoleInfoDTO;
 import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.qo.UserAccountQO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
@@ -117,7 +116,7 @@ public class UserAccountController extends BaseController {
     @ApiOperation(value = "角色管理-当前角色绑定了那些账号")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("roleAccountList")
-    public ResultBody<RoleInfoDTO> roleAccountList(@ApiParam(value = "角色id", required = true) @RequestParam Integer id) {
+    public ResultBody<UserAccountSimpleDTO> roleAccountList(@ApiParam(value = "角色id", required = true) @RequestParam Integer id) {
         return userAccountService.roleAccountList(id);
     }