Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
报警信息
Signed-off-by: zqb <940658539@qq.com>
wms下限打印排序修改，移库打印调整修改
Signed-off-by: loou <loou@vip.qq.com>
升级 EntityFramework 到 EntityFramework.6.0.0-alpha3；
Merge remote-tracking branch 'refs/remotes/zxl/master'
Merge remote-tracking branch 'refs/remotes/zqb/master'

Conflicts:
	code/Authority/Wms/Web.config