1.设备移交并发修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -19,10 +19,10 @@ import java.util.Map;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgEquipTransferDto", description="设备移交")
-public class JgEquipTransferDto  extends BaseDto {
+@ApiModel(value = "JgEquipTransferDto", description = "设备移交")
+public class JgEquipTransferDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "申请编号")
     private String applyNo;
@@ -91,7 +91,6 @@ public class JgEquipTransferDto  extends BaseDto {
     @ApiModelProperty(value = "流程执行角色")
     private String instanceRoles;
 
-    @TableField(exist = false)
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
@@ -138,5 +137,9 @@ public class JgEquipTransferDto  extends BaseDto {
     private String nextExecuteUserIds;
 
     @ApiModelProperty(value = "转办人")
-    private String  transferToUserIds;
+    private String transferToUserIds;
+
+
+    @ApiModelProperty(value = "工作流下一节点任务id")
+    private String nextTaskId;
 }