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

lty

1 天以前 8fe628e31d57f10f83b0c7b73aa4506e8d888c48

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

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

    // erp上报
    private String erpReport;

}