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
位置信息模块优化，但打印有点毛病
Signed-off-by: Dong-Yang <772369620@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

Conflicts:
	code/Authority/Wms/Controllers/Wms/BasisInfo/PositionController.cs
	code/Authority/Wms/Web.config
	code/Authority/Wms/Wms.csproj

Signed-off-by: Dong-Yang <772369620@qq.com>
货位位置信息修改

Signed-off-by: yaojianfeng <759775741@qq.com>
数据结构doc修改+WCS路径修改
Signed-off-by: Endis <369029432@qq.com>
Merge remote-tracking branch 'refs/remotes/zzb/master'
外部接口数据结构doc修改
Signed-off-by: Endis <369029432@qq.com>
Merge remote-tracking branch 'refs/remotes/zzb/master'
new_data.doc调整
Signed-off-by: Endis <369029432@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 remote-tracking branch 'refs/remotes/zzb/master'
Inter_BillMaster和Inter_BillDetail数据结构
Signed-off-by: Endis <369029432@qq.com>
Merge remote-tracking branch 'refs/remotes/zzb/master'