From 2255e8f0cb2a80568c7ba51014a33132b5b43278 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期五, 10 八月 2018 11:51:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFamilyActivity.txt |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyActivity.txt b/db/PyMongoDataServer/PySysDB/tagFamilyActivity.txt
index 57a3473..8c1181a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFamilyActivity.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFamilyActivity.txt
@@ -1,7 +1,7 @@
-ID	UnLockFuncID	TotalActivityTime	OnceActivity	SingleActiveValue
-1	34	70	10	5
-2	84	6	1	10
-3	15	3	1	15
-4	111	2	1	35
-5	12	10	1	2
-6	89	2	1	25
+ID	UnLockFuncID	TotalActivityTime	OnceActivity	SingleActiveValue
+1	34	70	10	5
+2	84	6	1	10
+3	15	3	1	15
+4	111	2	1	35
+5	12	10	1	2
+6	89	2	1	25

--
Gitblit v1.8.0