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
.idea/.idea.SlnMesnac/.idea Initial commit 1 year ago
SlnMesnac add - 添加六个接口(两个我方提供,四个向对方请求) 1 year ago
SlnMesnac.Business Merge branch 'master' into dep_wangsr 1 year ago
SlnMesnac.Common Initial commit 1 year ago
SlnMesnac.Config Merge branch 'master' into dep_wangsr 1 year ago
SlnMesnac.Extensions debug - 数据库连不上问题解决 1 year ago
SlnMesnac.Generate 新增获取等待任务逻辑 1 year ago
SlnMesnac.Ioc Initial commit 1 year ago
SlnMesnac.Library Initial commit 1 year ago
SlnMesnac.Model Merge branch 'master' into dep_wangsr 1 year ago
SlnMesnac.Mqtt Initial commit 1 year ago
SlnMesnac.Plc Initial commit 1 year ago
SlnMesnac.Quartz change - 修改报错 1 year ago
SlnMesnac.Redis Initial commit 1 year ago
SlnMesnac.Repository Merge branch 'master' into dep_wangsr 1 year ago
SlnMesnac.Rfid Initial commit 1 year ago
SlnMesnac.Serilog Initial commit 1 year ago
SlnMesnac.TouchSocket Merge branch 'master' into dep_wangsr 1 year ago
SlnMesnac.WPF Merge branch 'master' into dep_wangsr 1 year ago
.gitattributes Initial commit 1 year ago
.gitignore Initial commit 1 year ago
SlnMesnac.sln Initial commit 1 year ago