# 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
This commit is contained in:
2024-06-07 11:26:31 +08:00
8 changed files with 413 additions and 0 deletions