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

1

2 天以前 e596214d84efa77d0cf316563548f1b1d7643a37

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

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

    // erp上报
    private String erpReport;

}