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

zyx

2023-08-04 d55581ed00fd0a8ecce78a6ebe6f9e2ee86274b3

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

@@ -66,8 +66,8 @@
    /**
     * 物料号
     */
    @ApiModelProperty(value= "物料号")
    @ExcelProperty(value = "物料号")
    @ApiModelProperty(value= "物料名称")
    @ExcelProperty(value = "物料名称")
    private String maktx;

    /**