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

1

4 天以前 0dd6d42a545d1cf7c47ea1bd232e4857565c108a

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

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

    // erp上报
    private String erpReport;

}