Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-21 89034b8a149e156703bbc8c49671d747cf2298a2

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

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

    // erp上报
    private String erpReport;

    //机械臂自动补货开关
    private String autoReplenishment;

}