Merge branch 'pmsDevelop' of gitlab.freemud.com:yunpeng.song/takeout_sbk into pmsDevelop

fmTakeout/Control/SocketCommunicate.cpp

@@ -198,8 +198,9 @@ bool SocketCommunicate::connectTcpSvr()
         tmpMap.insert(JSON_TCP_DEVICE_PORT , _localPort);
         tmpMap.insert(JSON_TCP_DEVICE_TYPE , "pcsPlugin");
         tmpMap.insert(JSON_TCP_DEVICE_VER , _pcsPluginVersion);
-        tmpMap.insert(JSON_STOREID , _storeId);
         tmpMap.insert(JSON_LOGIN_WITH_CONTAINS_ORDER_DETAIL, true);
+        tmpMap.insert(JSON_STOREID , _storeId);
+
         setPosMetaData(tmpMap);
     }
 

fmTakeout/SslOperate/algorithmProcess.h

@@ -587,7 +587,7 @@ public:
         keys.clear();
 
         for(it = json.begin(); it != json.end(); ++it) {
-            if(it.value().isString() || it.value().isDouble())
+            if(it.value().isString() || it.value().isDouble() || it.value().isBool() )
                 keys.append(it.key());
         }
     }