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

lty

21 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/java/com/zy/common/model/LocDto.java

@@ -24,6 +24,8 @@

    private String unit;

    private String barcode;

    private String batch;
    private String brand = "";
    private String standby1 = "";