Merge branch 'jsxswms' into integrationWms

zhang

6 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

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

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

    // erp上报
    private String erpReport;

}