Merge remote-tracking branch 'origin/master'

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;