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

doum

昨天 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 server/system_service/src/main/java/com/doumee/core/utils/PasswordGenerator.java

@@ -25,7 +25,7 @@
    public static void getPasswordTypeCount(String password){
        Set<Integer> typeCount = new HashSet<>(4);
        for (int i = 0; i < password.length(); i++) {
            String key = password.substring(0,i);
            String key = password.substring(i,i+1);
            if(LOWER.indexOf(key)>=Constants.ZERO){
                typeCount.add(Constants.ZERO);
            }else if(UPPER.indexOf(key)>=Constants.ZERO){