Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

6 天以前 ff62f0248bf911a28ffc554447ee63b718d836df

 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;