启动LOGO图标
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
更新 AS.WCS AS.FORKLIFT nuget 包。
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
解决冲突
Conflicts:
	Automation.Plugins.AS.Forklift/Nuget/Automation.Plugins.AS.Forklift.nuspec
	Automation.Plugins.AS.WCS/Nuget/Automation.Plugins.AS.WCS.nuspec
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
Merge remote-tracking branch 'THOK-SW/master'
1。同意调整配置  2.更换安装前的初始启动LOGO。
Merge remote-tracking branch 'zqb/master'
配置六盘水分拣
配置六盘水补货
六盘水配置说明修改