Merge remote-tracking branch 'origin/master'

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -229,12 +229,12 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
                 this.dao.update(update);
                 throw new AppException("登录密码错误！");
             } else {
-                if (sysUser.getLastUpdatePwdTime() != null) {
-                    long day = DateUtils.getBetween(sysUser.getLastUpdatePwdTime(), new Date(), 2);
-                    if (day >= 90) {
-                        throw new AppException(99998, "密码已超过三个月没有更改，请修改以后再登录");
-                    }
-                }
+//                if (sysUser.getLastUpdatePwdTime() != null) {
+//                    long day = DateUtils.getBetween(sysUser.getLastUpdatePwdTime(), new Date(), 2);
+//                    if (day >= 90) {
+//                        throw new AppException(99998, "密码已超过三个月没有更改，请修改以后再登录");
+//                    }
+//                }
             }
         } catch (Exception e) {
             throw new AppException("密码验认出错！", e);