Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/UserServiceImpl.java

@@ -419,7 +419,7 @@ public class UserServiceImpl implements UserService {
         //判断原始密码是否正确
         User isExistUser = userDao.getUserByNamePassByUpdate(user.getUserName(), EncryptUtils.StrToMD5(oldPassword));
         if (isExistUser == null) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "旧密码输入错误");
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "原密码输入错误");
         }
         //修改密码
         user.setNewPassword(EncryptUtils.StrToMD5(newPassword));