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

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

 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= "序列码")