5 Commits (c7d55e9fc08f0886a5761ec7e37a0a6e83a93df0)

Author SHA1 Message Date
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
4 months ago
SoulStar 0b6b31a706 add - TCP信号接收 4 months ago
CaesarBao 0908de22e9 新增机械臂状态显示 4 months ago
SoulStar 4edefeec12 add - 添加六个接口(两个我方提供,四个向对方请求) 4 months ago
baogq e508d04eee Initial commit 5 months ago