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

Conflicts:
	THOK.XC.Process/Process_Car/CarProcess.cs
Merge branch 'master' of git@github.com:shjstudy-pc/HNXC_WCS.git
Signed-off-by: jerry <mahaiping@skyseaok.com>
Signed-off-by: shjstudy-pc <sunhaijun@skyseaok.com>