Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

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

@@ -141,6 +141,7 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl<DataSyncReco
                 IcResiUserEntity icResiUserEntity = icResiUserDao.selectOne(queryWrapper);
                 if (null == icResiUserEntity) {
                     existedFlag = false;
+                    entity.setDealStatus(NumConstant.TWO);
                     entity.setIcResiUserId(null);
                     entity.setDealResult("居民信息表不存在此居民");
                 }else{