From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码

---
 ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG
index 783119c..ccd4c22 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG
Binary files differ

--
Gitblit v1.8.0