区域信息，尺寸信息，货位信息打印代码优化完成
Signed-off-by: yaojianfeng <759775741@qq.com>
Signed-off-by: Dong-Yang <772369620@qq.com>
Merge branch 'master' of git://github.com/Dong-Yang/wms_rfid.git
增加zip方法 实现对字符串的zip压缩和base64编码
Signed-off-by: zqb <940658539@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge remote-tracking branch 'refs/remotes/zqb/master'
Merge remote-tracking branch 'refs/remotes/zxl/master'

Conflicts:
	code/Authority/Wms/Web.config
Merge branch 'master' of git@github.com:THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Controllers/Wms/BasisInfo/CellPositionController.cs
	code/Authority/Wms/Controllers/Wms/BasisInfo/RegionController.cs
	code/Authority/Wms/Controllers/Wms/BasisInfo/SizeController.cs
合并完修改完成
Signed-off-by: yaojianfeng <759775741@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
WMSPalletInfo 异常处理
Signed-off-by: zqb <940658539@qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
中软接口调整
Signed-off-by: git1207 <git1302@163.com>
PathNode修改
Signed-off-by: Endis <369029432@qq.com>
Merge remote-tracking branch 'refs/remotes/ljj/master'
Merge remote-tracking branch 'refs/remotes/zqb/master'

Conflicts:
	code/Authority/Wms/Service/WMSService.asmx.cs
Merge remote-tracking branch 'refs/remotes/zzb/master'
Merge remote-tracking branch 'refs/remotes/yyd/master'
Merge remote-tracking branch 'refs/remotes/yjf/master'
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Web.config