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

kaiyu

2021-04-12 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed

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

@@ -81,8 +81,7 @@
    }

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

}