You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
SoulStar 32b2acc58e Merge branch 'master' into dep_wangsr
# Conflicts:
#	SlnMesnac.Model/domain/AGVState.cs
#	SlnMesnac.Model/domain/AirportTask.cs
#	SlnMesnac.Quartz/QuartzSetUp.cs
#	SlnMesnac.Quartz/SlnMesnac.Quartz.csproj
#	SlnMesnac.Repository/service/IAirportTaskService.cs
#	SlnMesnac.Repository/service/Impl/AirportTaskServiceImpl.cs
#	SlnMesnac.WPF/MainWindow.xaml
#	SlnMesnac.WPF/appsettings.json
2 months ago
..
AGVLog.cs add - 添加六个接口(两个我方提供,四个向对方请求) 2 months ago
AGVSetting.cs add - 添加六个接口(两个我方提供,四个向对方请求) 2 months ago
AGVState.cs add - 添加六个接口(两个我方提供,四个向对方请求) 2 months ago
AirportTask.cs add - 添加六个接口(两个我方提供,四个向对方请求) 2 months ago
BaseMaterialInfo.cs Initial commit 2 months ago
BaseUser.cs Initial commit 2 months ago
ManipulatorLog.cs add - 添加六个接口(两个我方提供,四个向对方请求) 2 months ago
ManipulatorSetting.cs add - 添加六个接口(两个我方提供,四个向对方请求) 2 months ago
ManipulatorState.cs add - 添加六个接口(两个我方提供,四个向对方请求) 2 months ago