github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

调整包顺序

pull/154/head
RuoYi 2020-02-28 21:37:56 +08:00
parent e1e494de33
commit 9247e004d0
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -401,8 +401,6 @@ var table = {
var index = layer.load(2, {shade: false}); var index = layer.load(2, {shade: false});
$.modal.disable(); $.modal.disable();
var formData = new FormData(layero.find('form')[0]); 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({ $.ajax({
url: table.options.importUrl, url: table.options.importUrl,
data: formData, data: formData,

2
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
View File

@ -1,7 +1,7 @@
package ${packageName}.mapper; package ${packageName}.mapper;
import ${packageName}.domain.${ClassName};
import java.util.List; import java.util.List;
import ${packageName}.domain.${ClassName};
/** /**
* ${functionName}Mapper接口 * ${functionName}Mapper接口

2
ruoyi-generator/src/main/resources/vm/java/service.java.vm
View File

@ -1,7 +1,7 @@
package ${packageName}.service; package ${packageName}.service;
import ${packageName}.domain.${ClassName};
import java.util.List; import java.util.List;
import ${packageName}.domain.${ClassName};
#if($table.tree) #if($table.tree)
import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.common.core.domain.Ztree;
#end #end

2
ruoyi-quartz/src/main/resources/templates/monitor/job/job.html
View File

@ -145,7 +145,7 @@
/* 立即执行一次 */ /* 立即执行一次 */
function run(jobId, jobGroup) { function run(jobId, jobGroup) {
$.modal.confirm("确认要立即执行一次任务吗？", function() { $.modal.confirm("确认要立即执行一次任务吗？", function() {
$.operate.post(prefix + "/run", { "jobId": jobId, "jobId": jobId, "jobGroup": jobGroup}); $.operate.post(prefix + "/run", { "jobId": jobId, "jobGroup": jobGroup});
}) })
} }