Signed-off-by: jerry <mahaiping@skyseaok.com>
Merge branch 'master' of git@github.com:shjstudy/HNXC_WMS.git
Merge branch 'master' of git@github.com:shjstudy/HNXC_WMS.git
Merge branch 'master' of git@github.com:shjstudy/HNXC_WMS.git
仓库信息设置
Signed-off-by: syl10 <syl10@163.com>
Merge branch 'master' of git@github.com:syl10/HNXC_WMS.git

Conflicts:
	THOK.Authority.Bll/Service/ModuleService.cs
	THOK.Authority.Bll/Service/RoleService.cs
修改系统权限，去除地市及服务器选项。
Signed-off-by: shjstudy <shjstudy@163.com>