【修改内容】修改版本为1.4.3

【提交人】陈伟灿

VERSION

-1.4.2
\ No newline at end of file
+1.4.3
\ No newline at end of file

midware/midware/midware.c

@@ -1200,8 +1200,6 @@ static int kk_subDevice_property_handle(cJSON *info,cJSON *payload,char *deviceC
 	free(infff);
 	return 0;
 }
-<<<<<<< midware/midware/midware.c
-=======
 static int _kk_subDevice_online_to_app(cJSON *info,cJSON *payload)
 {
 	char ccuid[32] = {0};
@@ -1220,7 +1218,6 @@ static int _kk_subDevice_online_to_app(cJSON *info,cJSON *payload)
 	free(infff);
 	return 0;
 }
->>>>>>> midware/midware/midware.c
 static int kk_indoorAir_online_handle(dm_mgr_dev_node_t *node ,char *deviceCode,int epNum)
 {
 	int idx = 0;