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

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

@@ -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

@@ -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