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

Conflicts:
	THOK.XC.Dispatching.WCS/StockPLC_01.xml
	THOK.XC.Dispatching/View/Control/ButtonArea.resx