修复冲突

去除无用代码

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/AuthUserInfoController.java

@@ -22,7 +22,7 @@ public class AuthUserInfoController {
     private IAuthUserInfoFacade userInfoFacade;
 
     @RequestMapping("/page")
-    @ApiImplicitParam(name = "searchable",value = "查询条件")
+    @ApiImplicitParam(name = "searchable", value = "查询条件")
     @ApiOperation(value = "分页查询用户信息")
     public Page<AuthUserDTO> page(Searchable searchable) {
         return userInfoFacade.page(searchable.toSearchDTO());
@@ -31,7 +31,7 @@ public class AuthUserInfoController {
     @ApiOperation(value = "用户信息详情")
     @ApiImplicitParam(name = "id", value = "id")
     @GetMapping(value = "/detail/{id}")
-    public AuthUserDTO detail(@PathVariable(value = "id") String id){
+    public AuthUserDTO detail(@PathVariable(value = "id") String id) {
         AuthUserDTO authUserInfo = userInfoFacade.get(id);
         return authUserInfo;
     }
@@ -39,7 +39,7 @@ public class AuthUserInfoController {
     @ApiOperation(value = "用户信息删除")
     @ApiImplicitParam(name = "id", value = "id")
     @DeleteMapping(value = "/delete/{id}")
-    public Result delete(@PathVariable(value = "id") String id){
+    public Result delete(@PathVariable(value = "id") String id) {
         userInfoFacade.delete(id);
         return Result.success();
     }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/user/manager/utils/ImpExcelUtils.java

@@ -128,7 +128,7 @@ public class ImpExcelUtils {
                 if (!r.getCell(cellNum++).getStringCellValue().equals("民族（表码）")) {
                     throw new NumberFormatException("缺少''民族（表码）''列！");
                 }
-                if(UserTypeEnum.EXTERNAL.getValue().equals(userType)){
+                if (UserTypeEnum.EXTERNAL.getValue().equals(userType)) {
                     if (!r.getCell(cellNum++).getStringCellValue().equals("QQ号")) {
                         throw new NumberFormatException("缺少''QQ号''列！");
                     }
@@ -238,10 +238,10 @@ public class ImpExcelUtils {
                     throw new NumberFormatException("第" + (r.getRowNum() + 1) + "行\'\'编号\'\'格式为\'\'FJ\'\'加6位数字，如\'\'FJ000001\'\'！");
                 }*/
             }
-            if(r.getCell(1)!=null){
+            if (r.getCell(1) != null) {
                 r.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
                 info.setPoliceNumber(r.getCell(1).getStringCellValue());
-            }else{
+            } else {
                 info.setPoliceNumber("");
             }
             if (r.getCell(2) == null || StringUtils.isBlank(r.getCell(2).getStringCellValue())) {