Merge remote-tracking branch 'origin/master'

ebts-ui/src/views/login.vue

@@ -102,8 +102,10 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.codeUrl = "data:image/gif;base64," + res.img;
-        this.loginForm.uuid = res.uuid;
+        console.log(res)
+        let data = res.data
+        this.codeUrl = "data:image/gif;base64," + data.img;
+        this.loginForm.uuid = data.uuid;
       });
     },
     getCookie() {

ebts-ui/src/views/tool/module/index.vue

@@ -257,7 +257,7 @@ export default {
     },
     /** 生成代码操作 */
     handleGenTable(row) {
-      downLoadZip("/generator/intertable/moudlegen/" + row.id, "hchyun");
+      downLoadZip("/generator/intertable/modulegen/" + row.id, "ebts");
     },
     /** 高亮显示 */
     highlightedCode(code, key) {