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

Junjie

7 天以前 637e8436a33cbc4ea04d4fc68763debaba8412c4

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

@@ -204,7 +204,7 @@
    private String tkFlag = "";

    //库存状态
    private Integer cstateid;
    private String cstateid;

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