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

mrzhssss

2022-05-27 c6ab1a516d8398de65512fcd380d89e46ec8e430

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

@@ -43,8 +43,8 @@
    @ExcelProperty("商品名称")
    private String maktx;

    @ApiModelProperty(value= "批号")
    @ExcelProperty("批号")
    @ApiModelProperty(value= "序列码")
    @ExcelProperty("序列码")
    private String batch;

    @ApiModelProperty(value= "单据编号")