Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-23 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14

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

@@ -81,7 +81,6 @@
    }

    public static void main(String[] args) {
        System.out.println(encrypt("404897439","AD42F7787B035B7580000EF93BE20BAD"));
        System.out.println(encrypt("chenkaiyu111","AD42F7787B035B7580000EF93BE20BAD"));
    }