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

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -757,10 +757,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
             "iotprod".equals(springProfile)||//物联网
             "iotprodIn".equals(springProfile)//物联网
        ) {
            user.setPassword(MD5.md5Hex("a"+password+"*" + "{" + user.getSalt() + "}"));
        }else {
            user.setPassword(MD5.md5Hex(password + "{" + user.getSalt() + "}"));
            password = "a"+password+"*";
        }
        user.setPassword(MD5.md5Hex(password + "{" + user.getSalt() + "}"));
        userDao.save(user);
        saveUserPwlimitDate(userId);
        result.put("response",ConstantUtils.SUCCESS);