Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

 screen-common/src/main/java/com/moral/util/MD5Utils.java

@@ -85,7 +85,8 @@
    }

    public static void main(String[] args) {
        System.out.println(saltMD5("123456"));
        System.out.println(        saltMD5Verify("123456","63E23606B61A58FF1C48898988D415840F5DD6896BD5EC26")
);
    }

}