Merge remote-tracking branch 'origin/master'

王佳豪

2021-06-04 9891b042e48b186bbb850ab2ed445308bf5eec72

 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;
}