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/dto/JgTransferNoticeDto.java

@@ -140,4 +140,10 @@ public class JgTransferNoticeDto extends BaseDto {
     @ApiModelProperty(value = "是否西咸")
     private String isXixian;
 
+    @ApiModelProperty(value = "设备使用地点-街道（镇）")
+    private String factoryUseSiteStreet;
+
+    @ApiModelProperty(value = "设备使用地点-街道（镇）-名称")
+    private String streetName;
+
 }

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

@@ -255,4 +255,18 @@ public class JgTransferNotice extends BaseEntity {
      */
     @TableField("is_xixian")
     private String isXixian;
+
+    /**
+     *  	 * 设备使用地点-街道（镇）
+     *      */
+
+    @TableField(value ="\"factory_use_site_street\"")
+    private String factoryUseSiteStreet;
+
+    /**
+     *  	 * 设备使用地点-街道（镇）-名称
+     *      */
+
+    @TableField(value ="\"street_name\"")
+    private String streetName;
 }