Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

3 小时以前 5127f46eedeede5cbfeae7a4908ddac11d332494

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

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

    // erp上报
    private String erpReport;

}