Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-08-03 1ff0f95e1a2e10af8d356f797106f1e4b9ad873f

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

@@ -16,4 +16,13 @@

    private String warehouse;

    private String mnemonic;

    private String supplier;

    private String lgnum;

    private String type;

    private String altme;
}