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

zjj

2024-09-03 e1c7f150792a5085dd64e86e6af82820ab34dc05

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

@@ -63,4 +63,7 @@
    // erp上报
    private String erpReport;

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

}