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

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

@@ -490,7 +490,7 @@ public class JgInstallationNotice extends BaseEntity {
     /**
      * 工程装置主键
      */
-    @TableField("project_contraption_seq")
-    private String projectContraptionSeq;
+    @TableField("project_contraption_id")
+    private String projectContraptionId;
 
 }

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

@@ -261,4 +261,10 @@ public class JgUseRegistration extends BaseEntity {
      */
     @TableField("supervision_org_code")
     private String supervisionOrgCode;
+
+    /**
+     * 工程装置id
+     */
+    @TableField("project_contraption_id")
+    private String projectContraptionId;
 }