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

Junjie

9 天以前 637e8436a33cbc4ea04d4fc68763debaba8412c4

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -65,6 +65,9 @@
        //
        private String tiaoma;

        //库存状态
        private String cstateid;

    }

}