Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

whycq

2023-08-28 d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020

 src/main/java/com/zy/asrs/entity/Mat.java

@@ -338,9 +338,9 @@
    private Boolean inoutEveryday;

    /**
     * 物料类型{1:单品区,2:高频混放区,3:低频混放区}
     * 上架区域{1:单品区,2:高频混放区,3:低频混放区}
     */
    @ApiModelProperty(value= "物料类型")
    @ApiModelProperty(value= "上架区域")
    @TableField("mat_type")
    private Integer matType;