解决冲突

qiuyao

2025-04-28 1dcc7b63a20daad7c7060f18878d8e8dbaad02de

 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceTeamService.cs

@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.Telescopic;
@@ -13,8 +14,6 @@
    public interface IMaintenanceTeamService : IService<Dt_MaintenanceTeam>
    {
        IRepository<Dt_MaintenanceTeam> Repository { get; }
<<<<<<< Updated upstream
=======


        /// <summary>
@@ -24,6 +23,7 @@
        WebResponseContent MaintenanceSettingRecord(PaginationDTO pagination);


>>>>>>> Stashed changes
    }


}