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

1

4 天以前 0dd6d42a545d1cf7c47ea1bd232e4857565c108a

 src/main/java/com/zy/common/properties/SystemProperties.java

@@ -15,7 +15,8 @@
    public static final String SALT = "123456789qwertyu";

    // 系统激活状态 (默认未激活)
    public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
//    public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
    public static boolean SYSTEM_ACTIVATION = Boolean.TRUE;

    public static String getActivationCode(String fileName){
        StringBuilder activationCode = new StringBuilder();