Update 解决冲突

SERVER/ChickenFarmV3/vb-common/vb-common-core/src/main/java/cn/vber/common/core/constant/CacheNames.java

@@ -15,11 +15,6 @@ package cn.vber.common.core.constant;
  */
 public interface CacheNames {
 
-    /**
-     * 设备名称
-     */
-    String DEVICE_NAME = "device_name#30d";
-
     /**
      * 演示案例
      */
@@ -106,4 +101,6 @@ public interface CacheNames {
     //批次缓存
     String BATCH_NUM_INFO = "batch_num_info";
 
+    String CHICKEN_COOP = "chicken_coop_info";
+
 }