Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

zyx

2024-03-21 c253255495465d4406fcaddeb7be40d15fce290a

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

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

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

}