合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 src/main/java/com/zy/system/entity/license/CustomLicenseManager.java

@@ -34,7 +34,7 @@
    }

    public CustomLicenseManager(LicenseParam param) {
        super(param);
        //super(param);
    }

    /**