Merge remote-tracking branch 'aliyun/jkasrs' into jkasrs

mrzhssss

2022-06-07 1d997b9fd1cc2627a1313be762a76cc7cd37fabe

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

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

    // erp上报
    private String erpReport;

}