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

Junjie

2023-10-16 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34

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

@@ -39,8 +39,8 @@
    @ExcelProperty("物料号")
    private String matnr;

    @ApiModelProperty(value= "物料号")
    @ExcelProperty("物料号")
    @ApiModelProperty(value= "物料名称")
    @ExcelProperty("物料名称")
    private String maktx;

    @ApiModelProperty(value= "序列码")