Merge branch 'master' of git://github.com/git1207/wms_rfid.git
Merge branch 'master' of git://github.com/git1207/wms_rfid.git
Merge branch 'master' of git://github.com/git1207/wms_rfid.git
Merge remote-tracking branch 'refs/remotes/ljj/master'
调整项目目录及中文文档 ；
修改解决方案名；
取消页面压缩；流压缩出错；
修改解决方案名；
中软接口 WMSPalletInfo_ZipBase64方法改动
Signed-off-by: zqb <940658539@qq.com>
配置文件整理；
Merge remote-tracking branch 'refs/remotes/zqb/master'
添加表wms_xml_value,字段为ID，DateTime,XmlValue三个字段，
中软接口调试部分修改。
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
修改中软接口返回数据部分未加密问题
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'refs/remotes/ZhengXiaoLong/master'