Merge branch 'feature/dev_sunjiatan'

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -258,6 +258,7 @@ public enum EpmetErrorCode {
 	NOT_REGEIST_RESI(8927,"未注册居民"),
 	UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"),
 
+	MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"),
 
 	//通用错误码 start
 	//通用的 错误消息自己定义返回

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

@@ -93,7 +93,7 @@ public class MyHomeServiceImpl implements MyHomeService {
         userWrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard());
         IcResiUserEntity icUser = icResiUserDao.selectOne(userWrapper);
         if (null == icUser || !icUser.getHomeId().equals(formDTO.getHomeId())) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+            throw new EpmetException(EpmetErrorCode.MISMATCH.getCode(),
                     "人员与房屋信息不匹配，请与工作人员联系。",
                     "人员与房屋信息不匹配，请与工作人员联系。");
         }