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

@@ -262,9 +262,6 @@ public class JgTransferNoticeDto extends BaseDto {
     @ApiModelProperty (value = "设备种类编码")
     private String equListCode;
 
-    @ApiModelProperty (value = "设备种类编码")
-    private String equCategoryCode;
-
     @ApiModelProperty("是否暂存状态（0-否，1-是）")
     private String isTemporaryStatus;
 

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

@@ -305,9 +305,6 @@ public class JgTransferNotice extends BaseEntity {
     @TableField(value = "equ_category")
     private String equCategory;
 
-    @TableField(value = "equ_category_code")
-    private String equCategoryCode;
-
     @TableField(value = "equ_list")
     private String equList;
 

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

@@ -632,13 +632,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                         .map(String::valueOf)
                         .orElse("")
         );
-        dto.setEquCategoryCode(
-                Optional.ofNullable(deviceList)
-                        .filter(v -> !v.isEmpty() && v.get(0) != null)
-                        .map(v -> v.get(0).get("EQU_CATEGORY_CODE"))
-                        .map(String::valueOf)
-                        .orElse("")
-        );
         dto.setEquList(
                 Optional.ofNullable(deviceList)
                         .filter(v -> !v.isEmpty() && v.get(0) != null)