Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms...

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

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

@@ -15,7 +15,7 @@
    // 成品码
    private String productCode;

    // 生成单号
    // 生产单号
    private String warehouse;

    private String billNo;