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

cl

3 天以前 79eb9321e21e873a373c10480f8066cbc0407eb8

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

@@ -58,6 +58,8 @@
        //仓库编码
        private String manu = "";

        private String supplier = "";

    }

}