Merge remote-tracking branch 'remotes/origin/dev_bugfix' into dev

# Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
5 years ago · fdf6a4552f
1 changed files with 0 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@ -154,7 +154,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	/**
 	 * 居民注册信息提交
 	 *
 	 * @param userResiInfoDTO
 	 * @Author sunUserRoleServiceImpl
 	 */