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

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>
调试修改
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
尺寸信息GetDetails修改完成
Signed-off-by: yaojianfeng <759775741@qq.com>
货位信息编辑修改

Signed-off-by: yaojianfeng <759775741@qq.com>
基础信息管理视图大小修改完成

Signed-off-by: yaojianfeng <759775741@qq.com>
修改升级 到 Net 4.5 时，User 系列化错误；
Merge remote-tracking branch 'refs/remotes/yjf/master'

Conflicts:
	code/Authority/Wms/Web.config
Merge remote-tracking branch 'refs/remotes/zxl/master'
Merge remote-tracking branch 'refs/remotes/ljj/master'

Conflicts:
	code/Authority/Wms/Web.config
调整Entity Framework 包；
卷烟尺寸模块代码优化
Signed-off-by: Dong-Yang <772369620@qq.com>
Merge remote-tracking branch 'refs/remotes/yyd/master'

Conflicts:
	code/Authority/Wms/Web.config
	code/Authority/Wms/Wms.csproj
位置信息模块的打印功能优化
Signed-off-by: Dong-Yang <772369620@qq.com>
Merge remote-tracking branch 'refs/remotes/yyd/master'
卷烟尺寸
Signed-off-by: Dong-Yang <772369620@qq.com>
路径信息修改
Signed-off-by: Endis <369029432@qq.com>