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

tzsk

2025-08-04 cac5b314ea4f370235f9c40210ce792eb838c7ff

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

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

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

}