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

1

3 天以前 d5eb955933d4c7dc1f102d8a688f7447b5a674fd

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

@@ -195,12 +195,6 @@
    @TableField("box_type3")
    private String boxType3 = "1";

    @ApiModelProperty(value= "客户名称")
    private String owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){