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 7c0c98059a Merge branch 'master' into 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		1 year ago
..
Converter/Generate	Initial commit	1 year ago
Page	新增机械臂状态显示	1 year ago
Templates	add - 监控界面	1 year ago
ViewModel	Merge branch 'master' into dep_wangsr	1 year ago
data	提交数据库	1 year ago
App.xaml	Initial commit	1 year ago
App.xaml.cs	Initial commit	1 year ago
AssemblyInfo.cs	Initial commit	1 year ago
MainWindow.xaml	新增机械臂状态显示	1 year ago
MainWindow.xaml.cs	add - 接口测试方法	1 year ago
SlnMesnac.WPF.csproj	add - 监控界面	1 year ago
Startup.cs	Merge branch 'master' into dep_wangsr	1 year ago
appsettings.json	Merge branch 'master' into dep_wangsr	1 year ago