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/JgChangeRegistrationReformDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -167,4 +168,13 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     @ApiModelProperty(value = "作废人员id")
     private String cancelUserId;
 
+
+    @ApiModelProperty(value = "工程装置id")
+    private String projectContraptionId;
+
+
+    @TableField("project_contraption")
+    @ApiModelProperty(value = "工程装置名称")
+    private String projectContraption;
+
 }

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -171,6 +172,10 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty(value = "工程装置名称")
     private String projectContraption;
 
+
+    @ApiModelProperty(value = "工程装置id")
+    private String projectContraptionId;
+
     /* ----------------  -------------- */
 
     @ApiModelProperty (value = "告知设备列表")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationReform.java

@@ -286,4 +286,18 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField("cancel_user_name")
     private String cancelUserName;
+
+
+    /**
+     * 工程装置id
+     */
+    @TableField("project_contraption_id")
+    private String projectContraptionId;
+
+
+    /**
+     * 工程装置名称
+     */
+    @TableField("project_contraption")
+    private String projectContraption;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgReformNotice.java

@@ -184,6 +184,12 @@ public class JgReformNotice extends BaseEntity {
     private String projectContraption;
 
     /**
+     * 工程装置id
+     */
+    @TableField("project_contraption_id")
+    private String projectContraptionId;
+
+    /**
      * 施工负责人手机
      */
 	@TableField("construction_manager_phone")