Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

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

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

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

}