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

lty

22 小时以前 4bb523147bc6e9fef20142d1389c893f97321e02

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

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

    // erp上报
    private String erpReport;

}