合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 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;



}