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

lty

2 天以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

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

@@ -44,6 +44,10 @@
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty("单据ID")
    @TableField("order_id")
    private Long orderId;

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

@@ -277,7 +281,7 @@
        return this.boxType1;
    }

//    public void sync(Object source) {
//        Synchro.Copy(source, this);
//    }
    public void sync(Object source) {
        Synchro.Copy(source, this);
    }
}