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

zhou zhou

4 天以前 94e3cc94d83f5ec1bb64e48360a15d057f3643d9

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

@@ -24,6 +24,8 @@
    //唯一编码
    private String bsCode;

    private String carBarcode;

    private String type;

    private List<CombMat> combMats;