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

1

4 天以前 d5eb955933d4c7dc1f102d8a688f7447b5a674fd

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

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

    // erp上报
    private String erpReport;

}