From 3483db5a45edaa5d78d1d9674627f9600167cb8e Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 28 Feb 2020 21:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=85=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 2 -- ruoyi-generator/src/main/resources/vm/java/mapper.java.vm | 2 +- ruoyi-generator/src/main/resources/vm/java/service.java.vm | 2 +- ruoyi-quartz/src/main/resources/templates/monitor/job/job.html | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 1badba6e..c3cc0931 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -401,8 +401,6 @@ var table = { var index = layer.load(2, {shade: false}); $.modal.disable(); var formData = new FormData(layero.find('form')[0]); - //formData.append("file", layero.find('#file')[0].files[0]); - //formData.append("updateSupport", $("input[name='updateSupport']").is(':checked')); $.ajax({ url: table.options.importUrl, data: formData, diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm index a92a8f6d..6e20c516 100644 --- a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm @@ -1,7 +1,7 @@ package ${packageName}.mapper; -import ${packageName}.domain.${ClassName}; import java.util.List; +import ${packageName}.domain.${ClassName}; /** * ${functionName}Mapper接口 diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 1668c246..e073cc82 100644 --- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -1,7 +1,7 @@ package ${packageName}.service; -import ${packageName}.domain.${ClassName}; import java.util.List; +import ${packageName}.domain.${ClassName}; #if($table.tree) import com.ruoyi.common.core.domain.Ztree; #end diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html index a991df42..fde35d1c 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html @@ -145,7 +145,7 @@ /* 立即执行一次 */ function run(jobId, jobGroup) { $.modal.confirm("确认要立即执行一次任务吗?", function() { - $.operate.post(prefix + "/run", { "jobId": jobId, "jobId": jobId, "jobGroup": jobGroup}); + $.operate.post(prefix + "/run", { "jobId": jobId, "jobGroup": jobGroup}); }) }