Signed-off-by: jerry <mahaiping@skyseaok.com>
Merge branch 'master' of git@github.com:zyylonghai/HNXC_WMS.git

Conflicts:
	WMS/WMS.csproj
Merge branch 'master' of git@github.com:XMTHOK/HNXC_WMS.git

Conflicts:
	WMS/WMS.csproj