Merge remote-tracking branch 'origin/master'

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientMaiZhuController.java

@@ -41,7 +41,7 @@ public class ClientMaiZhuController {
     }
 
 
-    //熏蒸事件
+    //卖猪事件
     public GeneralResponse getEventList(Map<String, Object> params1) throws ClientException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();

huimv-farm-video/src/main/java/com/huimv/video/dhicc/icc/CommonConstant.java

@@ -13,7 +13,7 @@ public class CommonConstant {
     public static final String[] XunZhengChannle =  {"1003444$1$0$0"};
 
     //卖猪
-    public static final String[] MaiZhuChannle =  {"1003444$1$0$0"};
+    public static final String[] MaiZhuChannle =  {"1003445$1$0$0"};
 
     //洗消通道
     public static final String[] XixiaoChannle =  {"1002871$1$0$0","1002872$1$0$0","1002873$1$0$0"};