合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

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

@@ -66,4 +66,15 @@
    //机械臂自动补货开关
    private String autoReplenishment;

    //空板自动出库-包装
    private String packageEmptyAutoOUt;

    //空板自动出库-原材料
    private String mateEmptyAutoOut;

    //空板自动出库-箱壳
    private String boxEmptyAutoOut;



}