Merge remote-tracking branch 'zqb/master'
永州手工补货系统 实现参数设置
永州分拣监控系统 实现用户参数设置
Merge remote-tracking branch 'yd/master'
Merge remote-tracking branch 'thok_sw/master'

Conflicts:
	Automation.Plugins.YZ.Sorting/Automation.Plugins.YZ.Sorting.csproj
bug修改
[补货任务] 首页方法去重复
Merge remote-tracking branch 'zqb/master'
Merge remote-tracking branch 'zqb/master'
Merge remote-tracking branch 'yd/master'
更新  DotSpatial.Plugins.ExtensionManager.dll。
Merge remote-tracking branch 'yyd/master'
删除等待关闭前的事务处理。
修改混合烟道的查询
Merge remote-tracking branch 'zys/master'
Merge remote-tracking branch 'yd/master'
永州补货监控系统 功能框架搭建
修改混合烟道
永州手工补货系统 补货作业bug修改
Merge remote-tracking branch 'yd/master'