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

IZCD4L12RTSW0VZ\Administrator

2 天以前 c8712bbf027d7c3db9c33f8b015abed1473d06a7

 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;