Merge remote-tracking branch 'origin/master'

2025-02-20 20:41:10 +08:00 · 2025-02-20 20:41:10 +08:00 · acf469307d
parent 4715df61b1 9f7a65e43b
commit acf469307d
1 changed files with 2 additions and 0 deletions
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/ScrapApplyDetails.java
@ -108,6 +108,8 @@ public class ScrapApplyDetails extends BaseEntity {
    @ApiModelProperty(value = "物资类型名称")
    private String maTypeName;

+    private String typeModelName;
+
    @ApiModelProperty(value = "管理方式")
    private String manageType;