车载改动打开串口。
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of git://github.com/git1207/wms_rfid.git

Conflicts:
	code/Authority/Wms/Web.config
调试运行修改
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Web.config
修改下载分拣数据语句过长问题，
修改中软接口错误消息问题，
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'refs/remotes/zxl/master'
Path节点功能完善
Signed-off-by: Endis <369029432@qq.com>
登陆不创建用户
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge remote-tracking branch 'refs/remotes/ljj/master'
Merge remote-tracking branch 'refs/remotes/zzb/master'
Merge remote-tracking branch 'refs/remotes/zql/master'
调整个别页面效果
Signed-off-by: Endis <369029432@qq.com>
Merge branch 'gx_rfid_used_001'
堆垛机信息界面优化
Signed-off-by: Dong-Yang <772369620@qq.com>
下限生成 可用与不可用问题修改 --杨启辉
Signed-off-by: 杨启è¾? <377625583@qq.com>
Merge remote-tracking branch 'refs/remotes/ljj/master'
Merge remote-tracking branch 'refs/remotes/zqb/master'
Merge remote-tracking branch 'refs/remotes/yyd/master'
Merge remote-tracking branch 'refs/remotes/zzb/master'