1

platform/zigbee/app/builder/Z3GatewayHost/ZB/dev_map_table.json

@@ -13,6 +13,14 @@
 		"productCode": "3003",
 		"productName": "星辰系列.白色零火线三路灯控面板Z3S(KONKE)"
 	},{
+<<<<<<<<< Temporary merge branch 1
+		"modleId": "01020001",
+		"productCode": "3073",
+		"productName": "幻彩灯带控制器Z3S(KONKE)"
+	}
+	]
+}	
+=========
 		"modleId": "00048611",
 		"productCode": "3004",
 		"productName": "星辰系列.白色零火线情景面板Z3S(KONKE)"
@@ -83,7 +91,7 @@
 	},{
 		"modleId": "00038602",
 		"productCode": "3021",
-		"productName": "铂金系列·白色干触点窗帘面板Z3S(安心加)"
+		"productName": "铂金系列·白色干触点窗帘面板Z3S(安心加）"
 	},{
 		"modleId": "00068621",
 		"productCode": "3022",
@@ -143,7 +151,7 @@
 	},{
 		"modleId": "03020001",
 		"productCode": "3076",
-		"productName": "环境传感器KZ3S(KONKE)"
+		"productName": "环境传感器KZ3S（KONKE)"
 	},{
 		"modleId": "00510001",
 		"productCode": "3046",
@@ -217,3 +225,4 @@
 }	
 	
 		
+>>>>>>>>> Temporary merge branch 2