Merge remote-tracking branch 'origin/master'

zss

2023-08-18 6170908b69269ee14eae05787eafe682fda00eef

 inventory-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java

@@ -64,5 +64,8 @@
    @ApiModelProperty(value = "销售单id")
    private Integer saleId;

    @ApiModelProperty(value = "编制状态0:待编制;1已编制;")
    private Integer type;


}