处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

 BLL/HStation.BLL.Assets.Core/04-bll/03-AdaptingManage/AdaptingManage.cs

@@ -5,7 +5,7 @@
    /// <summary>
    ///
    /// </summary>
    public class AdaptingManage
    public partial class AdaptingManage
    {
        private readonly HStation.CAL.IAdaptingManage _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAdaptingManage>();

@@ -14,7 +14,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<List<Vmo.AdaptingManageVmo>> GetAll()
        public virtual async Task<List<Vmo.AdaptingManageVmo>> GetAll()
        {
            var DtoList = await _cal.GetAll();
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AdaptingManageDto, Vmo.AdaptingManageVmo>()
@@ -27,7 +27,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<Vmo.AdaptingManageVmo> GetByID(long ID)
        public virtual async Task<Vmo.AdaptingManageVmo> GetByID(long ID)
        {
            var DtoList = await _cal.GetByID(ID);
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AdaptingManageDto, Vmo.AdaptingManageVmo>()
@@ -41,7 +41,7 @@
        /// </summary>
        /// <param name="ID"></param>
        /// <returns></returns>
        public async Task<List<Vmo.AdaptingManageVmo>> GetByAdaptingType(Service.Assets.eAdaptingType type)
        public virtual async Task<List<Vmo.AdaptingManageVmo>> GetByAdaptingType(HStation.Assets.eAdaptingType type)
        {
            var DtoList = await _cal.GetByAdaptingType(type);
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AdaptingManageDto, Vmo.AdaptingManageVmo>()
@@ -53,7 +53,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<List<Vmo.AdaptingManageVmo>> GetByIds(List<long> Ids)
        public virtual async Task<List<Vmo.AdaptingManageVmo>> GetByIds(List<long> Ids)
        {
            var DtoList = await _cal.GetByIds(Ids);
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AdaptingManageDto, Vmo.AdaptingManageVmo>()
@@ -69,7 +69,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<long> Insert(Vmo.AdaptingManageVmo model)
        public virtual async Task<long> Insert(Vmo.AdaptingManageVmo model)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AdaptingManageVmo, AddAdaptingManageInput>()
             ).CreateMapper();
@@ -80,7 +80,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> Inserts(List<Vmo.AdaptingManageVmo> list)
        public virtual async Task<bool> Inserts(List<Vmo.AdaptingManageVmo> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AdaptingManageVmo, AddAdaptingManageInput>()
).CreateMapper();
@@ -91,7 +91,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> BulkInserts(List<Vmo.AdaptingManageVmo> list)
        public virtual async Task<bool> BulkInserts(List<Vmo.AdaptingManageVmo> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AdaptingManageVmo, AddAdaptingManageInput>()
).CreateMapper();
@@ -107,7 +107,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> Update(Vmo.AdaptingManageVmo model)
        public virtual async Task<bool> Update(Vmo.AdaptingManageVmo model)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AdaptingManageVmo, UpdateAdaptingManageInput>()
).CreateMapper();
@@ -119,7 +119,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> Updates(List<Vmo.AdaptingManageVmo> list)
        public virtual async Task<bool> Updates(List<Vmo.AdaptingManageVmo> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AdaptingManageVmo, UpdateAdaptingManageInput>()
).CreateMapper();
@@ -131,7 +131,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> BulkUpdates(List<Vmo.AdaptingManageVmo> list)
        public virtual async Task<bool> BulkUpdates(List<Vmo.AdaptingManageVmo> list)
        {
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AdaptingManageVmo, UpdateAdaptingManageInput>()
).CreateMapper();
@@ -147,7 +147,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> DeleteByID(long ID)
        public virtual async Task<bool> DeleteByID(long ID)
        {
            return await _cal.DeleteByID(ID);
        }
@@ -155,7 +155,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> DeleteByIds(List<long> Ids)
        public virtual async Task<bool> DeleteByIds(List<long> Ids)
        {
            return await _cal.DeleteByIds(Ids);
        }
@@ -163,7 +163,7 @@
        /// <summary>
        ///
        /// </summary>
        public async Task<bool> DeleteAll()
        public virtual async Task<bool> DeleteAll()
        {
            return await _cal.DeleteAll();
        }