Merge branch 'developer' into alpha

Helius

2022-03-15 5b94c18b2204a96be55798f1619a416526288e76

 zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java

@@ -110,7 +110,7 @@
            throw new GlobleException(AppMessageCode.User.ACCOUNT_IS_LOCK);
        } else {
            addErrorLoginRecord(loginUser, AppConstance.LOGIN_FAIL);
            throw new GlobleException(AppMessageCode.User.ACCOUNT_PASSWORD_ERROR, sessionErrorTimes, 5);
            throw new GlobleException(AppMessageCode.User.ACCOUNT_PASSWORD_ERROR, sessionErrorTimes, sessionErrorTimes, 5);
        }