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

lsh

3 天以前 506eef53323dddf4fefd2873be1c65942dac19b2

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

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

    // erp上报
    private String erpReport;

}