From f1a28e02e3478a56a653415164f3df61bb0a0c5a Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期一, 17 十二月 2018 22:46:44 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagEquipSuitCompound.txt | 450 ++++++++++++++++++++++++++++++-------------------------- 1 files changed, 240 insertions(+), 210 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagEquipSuitCompound.txt b/db/PyMongoDataServer/PySysDB/tagEquipSuitCompound.txt index cbcfe21..c665d09 100644 --- a/db/PyMongoDataServer/PySysDB/tagEquipSuitCompound.txt +++ b/db/PyMongoDataServer/PySysDB/tagEquipSuitCompound.txt @@ -62,111 +62,126 @@ 1 5 1 3 5032 10 1 6 1 3 5032 10 1 7 1 3 5032 10 -1 3 2 1 5012 16 -1 4 2 1 5012 16 -1 5 2 1 5012 16 -1 6 2 1 5012 16 -1 7 2 1 5012 16 -1 3 2 2 5022 16 -1 4 2 2 5022 16 -1 5 2 2 5022 16 -1 6 2 2 5022 16 -1 7 2 2 5022 16 -1 3 2 3 5032 16 -1 4 2 3 5032 16 -1 5 2 3 5032 16 -1 6 2 3 5032 16 -1 7 2 3 5032 16 -1 3 3 1 5012 27 -1 4 3 1 5012 27 -1 5 3 1 5012 27 -1 6 3 1 5012 27 -1 7 3 1 5012 27 -1 3 3 2 5022 27 -1 4 3 2 5022 27 -1 5 3 2 5022 27 -1 6 3 2 5022 27 -1 7 3 2 5022 27 -1 3 3 3 5032 27 -1 4 3 3 5032 27 -1 5 3 3 5032 27 -1 6 3 3 5032 27 -1 7 3 3 5032 27 -1 3 4 1 5012 48 -1 4 4 1 5012 48 -1 5 4 1 5012 48 -1 6 4 1 5012 48 -1 7 4 1 5012 48 -1 3 4 2 5022 48 -1 4 4 2 5022 48 -1 5 4 2 5022 48 -1 6 4 2 5022 48 -1 7 4 2 5022 48 -1 3 4 3 5032 48 -1 4 4 3 5032 48 -1 5 4 3 5032 48 -1 6 4 3 5032 48 -1 7 4 3 5032 48 -1 3 5 1 5012 86 -1 4 5 1 5012 86 -1 5 5 1 5012 86 -1 6 5 1 5012 86 -1 7 5 1 5012 86 -1 3 5 2 5022 86 -1 4 5 2 5022 86 -1 5 5 2 5022 86 -1 6 5 2 5022 86 -1 7 5 2 5022 86 -1 3 5 3 5032 86 -1 4 5 3 5032 86 -1 5 5 3 5032 86 -1 6 5 3 5032 86 -1 7 5 3 5032 86 -1 3 6 1 5012 155 -1 4 6 1 5012 155 -1 5 6 1 5012 155 -1 6 6 1 5012 155 -1 7 6 1 5012 155 -1 3 6 2 5022 155 -1 4 6 2 5022 155 -1 5 6 2 5022 155 -1 6 6 2 5022 155 -1 7 6 2 5022 155 -1 3 6 3 5032 155 -1 4 6 3 5032 155 -1 5 6 3 5032 155 -1 6 6 3 5032 155 -1 7 6 3 5032 155 -1 3 7 1 5012 288 -1 4 7 1 5012 288 -1 5 7 1 5012 288 -1 6 7 1 5012 288 -1 7 7 1 5012 288 -1 3 7 2 5022 288 -1 4 7 2 5022 288 -1 5 7 2 5022 288 -1 6 7 2 5022 288 -1 7 7 2 5022 288 -1 3 7 3 5032 288 -1 4 7 3 5032 288 -1 5 7 3 5032 288 -1 6 7 3 5032 288 -1 7 7 3 5032 288 -1 3 8 1 5012 532 -1 4 8 1 5012 532 -1 5 8 1 5012 532 -1 6 8 1 5012 532 -1 7 8 1 5012 532 -1 3 8 2 5022 532 -1 4 8 2 5022 532 -1 5 8 2 5022 532 -1 6 8 2 5022 532 -1 7 8 2 5022 532 -1 3 8 3 5032 532 -1 4 8 3 5032 532 -1 5 8 3 5032 532 -1 6 8 3 5032 532 -1 7 8 3 5032 532 +1 3 2 1 5012 18 +1 4 2 1 5012 18 +1 5 2 1 5012 18 +1 6 2 1 5012 18 +1 7 2 1 5012 18 +1 3 2 2 5022 18 +1 4 2 2 5022 18 +1 5 2 2 5022 18 +1 6 2 2 5022 18 +1 7 2 2 5022 18 +1 3 2 3 5032 18 +1 4 2 3 5032 18 +1 5 2 3 5032 18 +1 6 2 3 5032 18 +1 7 2 3 5032 18 +1 3 3 1 5012 35 +1 4 3 1 5012 35 +1 5 3 1 5012 35 +1 6 3 1 5012 35 +1 7 3 1 5012 35 +1 3 3 2 5022 35 +1 4 3 2 5022 35 +1 5 3 2 5022 35 +1 6 3 2 5022 35 +1 7 3 2 5022 35 +1 3 3 3 5032 35 +1 4 3 3 5032 35 +1 5 3 3 5032 35 +1 6 3 3 5032 35 +1 7 3 3 5032 35 +1 3 4 1 5012 60 +1 4 4 1 5012 60 +1 5 4 1 5012 60 +1 6 4 1 5012 60 +1 7 4 1 5012 60 +1 3 4 2 5022 60 +1 4 4 2 5022 60 +1 5 4 2 5022 60 +1 6 4 2 5022 60 +1 7 4 2 5022 60 +1 3 4 3 5032 60 +1 4 4 3 5032 60 +1 5 4 3 5032 60 +1 6 4 3 5032 60 +1 7 4 3 5032 60 +1 3 5 1 5012 115 +1 4 5 1 5012 115 +1 5 5 1 5012 115 +1 6 5 1 5012 115 +1 7 5 1 5012 115 +1 3 5 2 5022 115 +1 4 5 2 5022 115 +1 5 5 2 5022 115 +1 6 5 2 5022 115 +1 7 5 2 5022 115 +1 3 5 3 5032 115 +1 4 5 3 5032 115 +1 5 5 3 5032 115 +1 6 5 3 5032 115 +1 7 5 3 5032 115 +1 3 6 1 5012 211 +1 4 6 1 5012 211 +1 5 6 1 5012 211 +1 6 6 1 5012 211 +1 7 6 1 5012 211 +1 3 6 2 5022 211 +1 4 6 2 5022 211 +1 5 6 2 5022 211 +1 6 6 2 5022 211 +1 7 6 2 5022 211 +1 3 6 3 5032 211 +1 4 6 3 5032 211 +1 5 6 3 5032 211 +1 6 6 3 5032 211 +1 7 6 3 5032 211 +1 3 7 1 5012 395 +1 4 7 1 5012 395 +1 5 7 1 5012 395 +1 6 7 1 5012 395 +1 7 7 1 5012 395 +1 3 7 2 5022 395 +1 4 7 2 5022 395 +1 5 7 2 5022 395 +1 6 7 2 5022 395 +1 7 7 2 5022 395 +1 3 7 3 5032 395 +1 4 7 3 5032 395 +1 5 7 3 5032 395 +1 6 7 3 5032 395 +1 7 7 3 5032 395 +1 3 8 1 5012 781 +1 4 8 1 5012 781 +1 5 8 1 5012 781 +1 6 8 1 5012 781 +1 7 8 1 5012 781 +1 3 8 2 5022 781 +1 4 8 2 5022 781 +1 5 8 2 5022 781 +1 6 8 2 5022 781 +1 7 8 2 5022 781 +1 3 8 3 5032 781 +1 4 8 3 5032 781 +1 5 8 3 5032 781 +1 6 8 3 5032 781 +1 7 8 3 5032 781 +1 3 9 1 5012 1417 +1 4 9 1 5012 1417 +1 5 9 1 5012 1417 +1 6 9 1 5012 1417 +1 7 9 1 5012 1417 +1 3 9 2 5022 1417 +1 4 9 2 5022 1417 +1 5 9 2 5022 1417 +1 6 9 2 5022 1417 +1 7 9 2 5022 1417 +1 3 9 3 5032 1417 +1 4 9 3 5032 1417 +1 5 9 3 5032 1417 +1 6 9 3 5032 1417 +1 7 9 3 5032 1417 2 3 1 1 5012|5202 10|2 2 4 1 1 5012|5202 10|2 2 5 1 1 5012|5202 10|2 @@ -182,108 +197,123 @@ 2 5 1 3 5032|5202 10|2 2 6 1 3 5032|5202 10|2 2 7 1 3 5032|5202 10|2 -2 3 2 1 5012|5202 16|3 -2 4 2 1 5012|5202 16|3 -2 5 2 1 5012|5202 16|3 -2 6 2 1 5012|5202 16|3 -2 7 2 1 5012|5202 16|3 -2 3 2 2 5022|5202 16|3 -2 4 2 2 5022|5202 16|3 -2 5 2 2 5022|5202 16|3 -2 6 2 2 5022|5202 16|3 -2 7 2 2 5022|5202 16|3 -2 3 2 3 5032|5202 16|3 -2 4 2 3 5032|5202 16|3 -2 5 2 3 5032|5202 16|3 -2 6 2 3 5032|5202 16|3 -2 7 2 3 5032|5202 16|3 -2 3 3 1 5012|5202 27|5 -2 4 3 1 5012|5202 27|5 -2 5 3 1 5012|5202 27|5 -2 6 3 1 5012|5202 27|5 -2 7 3 1 5012|5202 27|5 -2 3 3 2 5022|5202 27|5 -2 4 3 2 5022|5202 27|5 -2 5 3 2 5022|5202 27|5 -2 6 3 2 5022|5202 27|5 -2 7 3 2 5022|5202 27|5 -2 3 3 3 5032|5202 27|5 -2 4 3 3 5032|5202 27|5 -2 5 3 3 5032|5202 27|5 -2 6 3 3 5032|5202 27|5 -2 7 3 3 5032|5202 27|5 -2 3 4 1 5012|5202 48|8 -2 4 4 1 5012|5202 48|8 -2 5 4 1 5012|5202 48|8 -2 6 4 1 5012|5202 48|8 -2 7 4 1 5012|5202 48|8 -2 3 4 2 5022|5202 48|8 -2 4 4 2 5022|5202 48|8 -2 5 4 2 5022|5202 48|8 -2 6 4 2 5022|5202 48|8 -2 7 4 2 5022|5202 48|8 -2 3 4 3 5032|5202 48|8 -2 4 4 3 5032|5202 48|8 -2 5 4 3 5032|5202 48|8 -2 6 4 3 5032|5202 48|8 -2 7 4 3 5032|5202 48|8 -2 3 5 1 5012|5202 86|13 -2 4 5 1 5012|5202 86|13 -2 5 5 1 5012|5202 86|13 -2 6 5 1 5012|5202 86|13 -2 7 5 1 5012|5202 86|13 -2 3 5 2 5022|5202 86|13 -2 4 5 2 5022|5202 86|13 -2 5 5 2 5022|5202 86|13 -2 6 5 2 5022|5202 86|13 -2 7 5 2 5022|5202 86|13 -2 3 5 3 5032|5202 86|13 -2 4 5 3 5032|5202 86|13 -2 5 5 3 5032|5202 86|13 -2 6 5 3 5032|5202 86|13 -2 7 5 3 5032|5202 86|13 -2 3 6 1 5012|5202 155|21 -2 4 6 1 5012|5202 155|21 -2 5 6 1 5012|5202 155|21 -2 6 6 1 5012|5202 155|21 -2 7 6 1 5012|5202 155|21 -2 3 6 2 5022|5202 155|21 -2 4 6 2 5022|5202 155|21 -2 5 6 2 5022|5202 155|21 -2 6 6 2 5022|5202 155|21 -2 7 6 2 5022|5202 155|21 -2 3 6 3 5032|5202 155|21 -2 4 6 3 5032|5202 155|21 -2 5 6 3 5032|5202 155|21 -2 6 6 3 5032|5202 155|21 -2 7 6 3 5032|5202 155|21 -2 3 7 1 5012|5202 288|34 -2 4 7 1 5012|5202 288|34 -2 5 7 1 5012|5202 288|34 -2 6 7 1 5012|5202 288|34 -2 7 7 1 5012|5202 288|34 -2 3 7 2 5022|5202 288|34 -2 4 7 2 5022|5202 288|34 -2 5 7 2 5022|5202 288|34 -2 6 7 2 5022|5202 288|34 -2 7 7 2 5022|5202 288|34 -2 3 7 3 5032|5202 288|34 -2 4 7 3 5032|5202 288|34 -2 5 7 3 5032|5202 288|34 -2 6 7 3 5032|5202 288|34 -2 7 7 3 5032|5202 288|34 -2 3 8 1 5012|5202 532|55 -2 4 8 1 5012|5202 532|55 -2 5 8 1 5012|5202 532|55 -2 6 8 1 5012|5202 532|55 -2 7 8 1 5012|5202 532|55 -2 3 8 2 5022|5202 532|55 -2 4 8 2 5022|5202 532|55 -2 5 8 2 5022|5202 532|55 -2 6 8 2 5022|5202 532|55 -2 7 8 2 5022|5202 532|55 -2 3 8 3 5032|5202 532|55 -2 4 8 3 5032|5202 532|55 -2 5 8 3 5032|5202 532|55 -2 6 8 3 5032|5202 532|55 -2 7 8 3 5032|5202 532|55 +2 3 2 1 5012|5202 18|3 +2 4 2 1 5012|5202 18|3 +2 5 2 1 5012|5202 18|3 +2 6 2 1 5012|5202 18|3 +2 7 2 1 5012|5202 18|3 +2 3 2 2 5022|5202 18|3 +2 4 2 2 5022|5202 18|3 +2 5 2 2 5022|5202 18|3 +2 6 2 2 5022|5202 18|3 +2 7 2 2 5022|5202 18|3 +2 3 2 3 5032|5202 18|3 +2 4 2 3 5032|5202 18|3 +2 5 2 3 5032|5202 18|3 +2 6 2 3 5032|5202 18|3 +2 7 2 3 5032|5202 18|3 +2 3 3 1 5012|5202 35|5 +2 4 3 1 5012|5202 35|5 +2 5 3 1 5012|5202 35|5 +2 6 3 1 5012|5202 35|5 +2 7 3 1 5012|5202 35|5 +2 3 3 2 5022|5202 35|5 +2 4 3 2 5022|5202 35|5 +2 5 3 2 5022|5202 35|5 +2 6 3 2 5022|5202 35|5 +2 7 3 2 5022|5202 35|5 +2 3 3 3 5032|5202 35|5 +2 4 3 3 5032|5202 35|5 +2 5 3 3 5032|5202 35|5 +2 6 3 3 5032|5202 35|5 +2 7 3 3 5032|5202 35|5 +2 3 4 1 5012|5202 60|8 +2 4 4 1 5012|5202 60|8 +2 5 4 1 5012|5202 60|8 +2 6 4 1 5012|5202 60|8 +2 7 4 1 5012|5202 60|8 +2 3 4 2 5022|5202 60|8 +2 4 4 2 5022|5202 60|8 +2 5 4 2 5022|5202 60|8 +2 6 4 2 5022|5202 60|8 +2 7 4 2 5022|5202 60|8 +2 3 4 3 5032|5202 60|8 +2 4 4 3 5032|5202 60|8 +2 5 4 3 5032|5202 60|8 +2 6 4 3 5032|5202 60|8 +2 7 4 3 5032|5202 60|8 +2 3 5 1 5012|5202 115|13 +2 4 5 1 5012|5202 115|13 +2 5 5 1 5012|5202 115|13 +2 6 5 1 5012|5202 115|13 +2 7 5 1 5012|5202 115|13 +2 3 5 2 5022|5202 115|13 +2 4 5 2 5022|5202 115|13 +2 5 5 2 5022|5202 115|13 +2 6 5 2 5022|5202 115|13 +2 7 5 2 5022|5202 115|13 +2 3 5 3 5032|5202 115|13 +2 4 5 3 5032|5202 115|13 +2 5 5 3 5032|5202 115|13 +2 6 5 3 5032|5202 115|13 +2 7 5 3 5032|5202 115|13 +2 3 6 1 5012|5202 211|21 +2 4 6 1 5012|5202 211|21 +2 5 6 1 5012|5202 211|21 +2 6 6 1 5012|5202 211|21 +2 7 6 1 5012|5202 211|21 +2 3 6 2 5022|5202 211|21 +2 4 6 2 5022|5202 211|21 +2 5 6 2 5022|5202 211|21 +2 6 6 2 5022|5202 211|21 +2 7 6 2 5022|5202 211|21 +2 3 6 3 5032|5202 211|21 +2 4 6 3 5032|5202 211|21 +2 5 6 3 5032|5202 211|21 +2 6 6 3 5032|5202 211|21 +2 7 6 3 5032|5202 211|21 +2 3 7 1 5012|5202 395|34 +2 4 7 1 5012|5202 395|34 +2 5 7 1 5012|5202 395|34 +2 6 7 1 5012|5202 395|34 +2 7 7 1 5012|5202 395|34 +2 3 7 2 5022|5202 395|34 +2 4 7 2 5022|5202 395|34 +2 5 7 2 5022|5202 395|34 +2 6 7 2 5022|5202 395|34 +2 7 7 2 5022|5202 395|34 +2 3 7 3 5032|5202 395|34 +2 4 7 3 5032|5202 395|34 +2 5 7 3 5032|5202 395|34 +2 6 7 3 5032|5202 395|34 +2 7 7 3 5032|5202 395|34 +2 3 8 1 5012|5202 781|55 +2 4 8 1 5012|5202 781|55 +2 5 8 1 5012|5202 781|55 +2 6 8 1 5012|5202 781|55 +2 7 8 1 5012|5202 781|55 +2 3 8 2 5022|5202 781|55 +2 4 8 2 5022|5202 781|55 +2 5 8 2 5022|5202 781|55 +2 6 8 2 5022|5202 781|55 +2 7 8 2 5022|5202 781|55 +2 3 8 3 5032|5202 781|55 +2 4 8 3 5032|5202 781|55 +2 5 8 3 5032|5202 781|55 +2 6 8 3 5032|5202 781|55 +2 7 8 3 5032|5202 781|55 +2 3 9 1 5012|5202 1417|89 +2 4 9 1 5012|5202 1417|89 +2 5 9 1 5012|5202 1417|89 +2 6 9 1 5012|5202 1417|89 +2 7 9 1 5012|5202 1417|89 +2 3 9 2 5022|5202 1417|89 +2 4 9 2 5022|5202 1417|89 +2 5 9 2 5022|5202 1417|89 +2 6 9 2 5022|5202 1417|89 +2 7 9 2 5022|5202 1417|89 +2 3 9 3 5032|5202 1417|89 +2 4 9 3 5032|5202 1417|89 +2 5 9 3 5032|5202 1417|89 +2 6 9 3 5032|5202 1417|89 +2 7 9 3 5032|5202 1417|89 -- Gitblit v1.8.0