Merge branch 'abp' into card-flip

# Conflicts:
#	Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs
#	Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs
#	Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Caches/FileCacheItem.cs
#	Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
This commit is contained in:
chenchun
2025-11-17 11:21:14 +08:00
3 changed files with 42 additions and 84 deletions

View File

@@ -1,4 +1,4 @@
namespace Yi.Framework.Rbac.Domain.Shared.Caches;
namespace Yi.Framework.Rbac.Domain.Shared.Caches;
public class FileCacheItem
{