6 Commits (9b1e7f447ec1122f6e783d0c861fdbe1e08ebf0b)

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
CaesarBao 0908de22e9 新增机械臂状态显示 4 months ago
SoulStar 2feda5b29b add - 添加状态请求数据库插入 4 months ago
CaesarBao 63b59cca10 新增获取等待任务逻辑 5 months ago
CaesarBao c2673fe083 新增任务查询业务 5 months ago
baogq e508d04eee Initial commit 5 months ago