Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthWlyyConfigService.java

@@ -305,8 +305,8 @@ public class OauthWlyyConfigService {
                        String pw = idcard.substring(idcard.length()-6);
                        userDO.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
                        userDO.setSalt(salt);
                        userDO.setEnabled(1);
                        userDO.setLocked(0);
                        userDO.setEnabled(true);
                        userDO.setLocked(false);
                        userDO.setCreateTime(new Date());
                        userDO.setUpdateTime(new Date());
                        userDO = userDao.save(userDO);