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

Junjie

5 天以前 ca2a6d455604056ce628f296911f6abac85a7598

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

@@ -19,6 +19,9 @@
    // 库位编号
    private String locNo;

    //退库组托
    private String tkFlag;


    private List<CombMat> combMats;