Merge remote-tracking branch 'origin/master'

datav-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -205,12 +205,12 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 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("密码已超过三个月没有更改，请修改以后再登录");
-                    }
-                }
+//                if(sysUser.getLastUpdatePwdTime()!=null) {
+//                    long day = DateUtils.getBetween(sysUser.getLastUpdatePwdTime(), new Date(), 2);
+//                    if (day >= 90) {
+//                        throw new AppException("密码已超过三个月没有更改，请修改以后再登录");
+//                    }
+//                }
             }
         } catch (Exception e) {
             throw new AppException("密码验认出错！", e);

datav-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerServiceImpl.java

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