Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

22 小时以前 7b72d43503aa5df4c152b777777085d3cd5e2132

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

@@ -20,6 +20,8 @@

    private static final long serialVersionUID = 1L;

    private Long id;

    @ApiModelProperty(value= "托盘条码")
    private String zpallet;