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

zhou zhou

4 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

 src/main/java/com/zy/system/controller/LicenseCreatorController.java

@@ -99,4 +99,11 @@
        return R.error("许可证更新失败");
    }


    @RequestMapping(value = "/activate")
    public R activate() {
        licenseTimer.timer();
        return R.ok();
    }

}