Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zhangc

2025-04-18 a144c412981c49658c951db098a701a58f8e1ee3

 src/main/java/com/zy/common/entity/Parameter.java

@@ -60,4 +60,7 @@
    // 打包下线
    private String packDown;

    // erp上报
    private String erpReport;

}