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

lty

4 天以前 53ca017d46403700cabc775fc4dbd89f8ebdef78

 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= "单据编号")