Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044

 server/src/main/java/doumeemes/dao/ext/vo/MaterialDistributeExtListVO.java

@@ -139,4 +139,8 @@
    @ApiModelProperty(value = "分类小类id")
    private Integer cmodel3Id;

    @ApiModelProperty(value = "是否有bom：0=无；1=有")
    private Integer hasBom;


}