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

1

昨天 5e567919108b4e1c914cdb1aae5d91ff2eb337d7

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

@@ -130,7 +130,7 @@
    public BasArmMast(TaskArmReportParam param) {
        this.orderNo = param.getOrderNo();
        this.sku = param.getSku();
        this.matnr = param.getSku();
        this.matnr = param.getItem();
        this.po = param.getPo();
        this.upc = param.getUpc();
        this.supplier = param.getSupplier();