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

LSH

2023-08-28 bc64e9e55c22153ac194ef010c9349ce3783a1a8

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

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

    // erp上报
    private String erpReport;

}