Signed-off-by: zqb <940658539@qq.com>
Merge branch 'system_event_log'

Conflicts:
	code/Authority/Wms/Web.config
修正合并错误
Signed-off-by: zqb <940658539@qq.com>
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 https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
货位位置信息修改

Signed-off-by: yaojianfeng <759775741@qq.com>
调试修改
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
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
尺寸信息GetDetails修改完成
Signed-off-by: yaojianfeng <759775741@qq.com>
ADD：合同表数据结构
Signed-off-by: git1207 <git1302@163.com>
新增Navicert、Pallet表结构
Signed-off-by: zqb <940658539@qq.com>
Merge branch 'test' of https://github.com/zqb971/wms_rfid.git
UPDATE:合并后做的整理。
Signed-off-by: git1207 <git1302@163.com>
UPDATE:取消注释
Signed-off-by: git1207 <git1302@163.com>
UPDATE:配置
Signed-off-by: git1207 <git1302@163.com>
ADD:    添加数据表。
UPDATE: 数据结构。
Signed-off-by: git1207 <git1302@163.com>
货位信息编辑修改

Signed-off-by: yaojianfeng <759775741@qq.com>