Merge remote-tracking branch 'remote-thok-sw/master'
解决冲突
Conflicts:
	Automation.Plugins.AS.Stocking/Config/StockPLC.xml
	Automation.Plugins.Share.Stocking/Dal/StockPositionDal.cs