Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

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

@@ -102,4 +102,11 @@
        return R.ok();
    }


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

}