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

lty

17 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

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

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

    // erp上报
    private String erpReport;

}