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
添加表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>
改正一个判断的错误
test
test1
Merge remote-tracking branch 'refs/remotes/ZhengXiaoLong/master'
接口数据修改部分调整
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'refs/remotes/thok-zxl/master'
删除WMSService中“修改”功能，改成用“删除后再创建”。
Merge remote-tracking branch 'refs/remotes/ljj/master'
删除旧的解决方案；