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

Junjie

9 天以前 57fe41f460cb72684d6a76869ced6ae93577b75a

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

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

    // erp上报
    private String erpReport;

}