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

zwl

昨天 0cb44badbe4d0d6b58c6324d29d3c7193be687f2

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

@@ -48,11 +48,11 @@
    private String maktx;

    @ApiModelProperty(value= "规格")
    @ExcelProperty("规格")
    //@ExcelProperty("规格")
    private String specs;

    @ApiModelProperty(value= "货品特征")
    @ExcelProperty("货品特征")
    //@ExcelProperty("货品特征")
    private String batch;

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