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

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

 src/main/java/com/zy/asrs/entity/CombBillQueryVo.java

@@ -14,4 +14,15 @@

    private Double count;

    private String warehouse;

    private String mnemonic;

    private String supplier;

    private String lgnum;

    private String type;

    private String altme;
}