Skip to content

A
amos-boot-biz
Commit 30a50df8 authored by LiuLin's avatar LiuLin
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 826b1970 b5dfa49d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java
View file @ 30a50df8
......@@ -401,6 +401,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancelDto.setNextExecuteUserIds(nextUserIds);
JgScrapCancel jgScrapCancel = new JgScrapCancel();
BeanUtils.copyProperties(jgScrapCancelDto, jgScrapCancel);
updateTaskModel(jgScrapCancelDto, "0");
createTaskModel(jgScrapCancel, taskName, "1", nextUserIds);
}
JgScrapCancel cancel = new JgScrapCancel();
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @ 30a50df8
......@@ -237,7 +237,7 @@
"type": "113-1",
"pageType": "edit",
"name": "移装报废",
"url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&roleIds={roleIds}&userId={userId}&pageType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "113-2",
......@@ -255,6 +255,6 @@
"type": "113-2",
"pageType": "edit",
"name": "注销报废",
"url": "/mixuap?appId=1742358052905971713&id=1737358169170014210&roleIds={roleIds}&userId={userId}&pageType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
}
]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment