Merge branch 'master' of https://gitserver.xunjoy.com/zhangyang/zhipuzi_pos_windows

# Conflicts:
#	bin/Win32/Debug/zhipuzi_pos_windows/db/pos.db

zhipuzi_pos_windows/network/CZhipuziHttpClient.cpp

@@ -102,6 +102,7 @@ bool CZhipuziHttpClient::Request(std::string url, std::map<string, string> param
     params["username"] = m_client.m_username;
     params["nonce"] = nonce;
     params["timestamp"] = timestamp;
+	params["machinecode"] = "d1a6af1d480d0de7";
     params["url"] = m_client.m_yewu_ur + url;
 
     //计算签名