Merge remote-tracking branch 'origin/master'

66d95b4c · 温志超 · 2ba8dcaf · b6a2acbc · 66d95b4c
Commit 66d95b4c authored Nov 15, 2024 by 温志超
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

MdItemErpDto.java mes/src/main/java/com/ximai/mes/remote/dto/MdItemErpDto.java +4 -4

No files found.
--- a/mes/src/main/java/com/ximai/mes/remote/dto/MdItemErpDto.java
+++ b/mes/src/main/java/com/ximai/mes/remote/dto/MdItemErpDto.java
@@ -46,10 +46,10 @@ public class MdItemErpDto
    @ApiModelProperty("物料/产品分类ID")
    private Long itemTypeId;

-//    @JsonProperty("mb005")
-//    @JsonDeserialize(using = TrimStringDeserializer.class)
-//    @ApiModelProperty("物料/产品分类")
-//    private String itemTypeName;
+    @JsonProperty("udf05")
+    @JsonDeserialize(using = TrimStringDeserializer.class)
+    @ApiModelProperty("所属产线")
+    private String lineName;

    @JsonProperty("udf07")
    @JsonDeserialize(using = TrimStringDeserializer.class)