Merge branch 'master' of https://gitee.com/mingSoft/MCMS

Conflicts: src/main/webapp/WEB-INF/manager/main.ftl

Merge branch 'master' of https://gitee.com/mingSoft/MCMS
Conflicts: src/main/webapp/WEB-INF/manager/main.ftl
5d045428 · 信赵 · 23fec95b · c27af1cf · 5d045428
Commit 5d045428 authored Jan 31, 2020 by 信赵
--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/main.ftl
@@ -451,13 +451,8 @@
        });
      },
      //静态化
-      jumpStaticManager: function () {
-        window.parent.indexVue.open({
-          "modelId": 406,
-          "modelTitle": "静态化",
-          "modelModelId": 23,
-          "modelUrl": "cms/generate/index.do"
-        });
+    jumpStaticManager: function () {
+        window.parent.indexVue.open({"modelId":709,"modelTitle":"静态化","modelModelId":706,"modelUrl":"cms/generate/index.do"});
      },
      //管理员管理
      jumpAdmininstatorManager: function () {