Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

3 天以前 208ec6274f74c88ccf86c2fb3432a60cc7d21d59

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -325,6 +325,7 @@
                    .set(SystemUser::getProhibitStatus,Constants.ZERO)
                    .set(SystemUser::getErrTimes,Constants.ZERO)
                    .setSql(" PROHIBIT_TIME = null ")
                    .setSql(" PROHIBIT_REMARK = null ")
                    .eq(SystemUser::getId,user.getId())
            );
        }