Merge branch 'master' of git://github.com/Endis/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/Endis/wms_rfid.git
位置信息 新增-选择区域名称布局改动
Signed-off-by: zqb <940658539@qq.com>
修改错误页面与日志
Signed-off-by: zqloon <zqloon@gmail.com>
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/zqloon/wms_rfid.git into Login_log
路径信息修改完成
Signed-off-by: yaojianfeng <759775741@qq.com>
登录日志完成
Signed-off-by: zqb <940658539@qq.com>
修改日志功能
Signed-off-by: zqloon <zqloon@gmail.com>
Merge remote-tracking branch 'refs/remotes/zzb/master'
Merge remote-tracking branch 'refs/remotes/yjf/master'
业务日志完成
Signed-off-by: zqb <940658539@qq.com>
Merge remote-tracking branch 'refs/remotes/zql/master'
日志修改
Signed-off-by: zqloon <zqloon@gmail.com>
Merge remote-tracking branch 'refs/remotes/zql/master'
Merge branch 'master' of git://github.com/zqloon/wms_rfid.git

Conflicts:
	code/Authority/THOK.Authority.Bll/Interfaces/ISystemEventLogService.cs
	code/Authority/THOK.Authority.Bll/Service/SystemEventLogService.cs
	code/Authority/Wms/Controllers/Authority/LoginLogController.cs
	code/Authority/Wms/Controllers/Authority/SystemEventLogController.cs
修改数据库保存失败，异常重置数据库连接 ；
登录日志，业务日志查询改动
Signed-off-by: zqb <940658539@qq.com>
错误页面处理，添加登陆验证过滤器
Signed-off-by: zqloon <zqloon@gmail.com>