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

zyx

2024-04-07 0691d54265bdec95baa48d83a46d7f2937472613

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

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

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

}