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

Junjie

4 天以前 ca2a6d455604056ce628f296911f6abac85a7598

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

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

    // erp上报
    private String erpReport;

}