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

zyx

2023-12-22 9b3eeec64465760a4f351f63335f6693c30dda73

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

@@ -60,4 +60,10 @@
    // 打包下线
    private String packDown;

    // erp上报
    private String erpReport;

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

}