Commit Graph

6 Commits

Author SHA1 Message Date
xiaowei.song
be0ce445a4 Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES 2024-06-11 16:52:10 +08:00
xiaowei.song
f7341d71e8 涂装实验室输入 2024-06-11 16:51:44 +08:00
52d6ff5ff4 仓库修复003 2024-06-07 11:35:03 +08:00
ceeef502ba Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	server/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CommonFQCController.cs
#	server/ZR.Admin.WebApi/Extensions/SqlSugarCache.cs
#	server/ZR.Model/MES/qc/DTO/QcCommonFqcDto.cs
#	server/ZR.Service/mes/qc/CommonFQCService.cs
#	server/ZR.Service/mes/qc/IService/ICommonFQCService.cs
2024-06-07 11:26:31 +08:00
qianhao.xu
80b1bbccf9 agv调整 2024-06-06 13:22:15 +08:00
xiaowei.song
127c428a9e 油漆 2024-06-06 13:19:24 +08:00