Merge remote-tracking branch 'origin/master'

18516761980

2021-11-05 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3

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