SoulStar 42d0097363 Merge branch 'dep_wangsr' ... # Conflicts: # SlnMesnac.Config/AppConfig.cs # SlnMesnac.Repository/service/Impl/AGVStateServiceImpl.cs # SlnMesnac.TouchSocket/TcpServer.cs # SlnMesnac.WPF/ViewModel/IndexPage/IndexContentViewModel.cs # SlnMesnac.WPF/appsettings.json		5 months ago
..
BaseBusiness.cs	Initial commit	6 months ago
BaseStateRefreshBusiness.cs	add - 添加状态请求数据库插入	6 months ago
BaseTaskInfoBusiness.cs	新增机械臂状态显示	6 months ago