Merge branch 'dev_optimize' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -173,7 +173,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 });
             });
             if (str.length() > NumConstant.ZERO ) {
-                throw new RenException(String.format("新增居民信息,必要字段值为空,%s值为空", str));
+                String errorMsg = String.format("新增居民信息,必要字段值为空,%s值为空", str);
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
             }
         } else {
             throw new RenException(String.format("新增居民信息-根据客户Id查询必填信息失败，customerId->%s", tokenDto.getCustomerId()));