Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

zc

2024-09-05 9efa273533be66131806ea52b479dacc320d9c43

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

@@ -14,6 +14,8 @@

    private String matNo;

    private String matnr;

    private String matName;

    private String specs;