Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java

@@ -244,8 +244,8 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         JSONObject apply = sysClientPreMapperMapper.findByUserName(username);
         String salt = PasswordUtils.newSalt();
         applyInfo.put("salt", salt);
-        applyInfo.put("password_hash", PasswordUtils.hashPwd(apply.getString("password"), salt));
-        applyInfo.put("password_aes", PasswordUtils.encryptAESPwd(apply.getString("password")));
+        applyInfo.put("password_hash", PasswordUtils.hashPwd(applyInfo.getString("password"), salt));
+        applyInfo.put("password_aes", PasswordUtils.encryptAESPwd(applyInfo.getString("password")));
         if (apply == null) {
             sysClientPreMapperMapper.save(applyInfo);
         } else {