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

zhou zhou

6 天以前 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30

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

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

    // erp上报
    private String erpReport;

}