Merge pull request 'dev' (#1) from dev into main

Reviewed-on: #1

Apimanager_backend/Controllers/PackageController.cs

@@ -95,7 +95,7 @@ namespace Apimanager_backend.Controllers
         #endregion
         #region 获取套餐列表
         [HttpGet]
-        [Authorize(Roles = "User")]
+        //[Authorize(Roles = "User")]
         public async Task<ActionResult<ResponseBase<List<PackageInfoDto>>>> GetPackageList(int pageIndex,int pageSize,bool desc)
         {
             var packageList = await packageService.GetAllPackagesAsync(pageIndex,pageSize,desc);

Apimanager_backend/Data/ApiContext.cs

@@ -33,7 +33,7 @@ namespace Apimanager_backend.Data
             // 配置全局查询筛选器
             modelBuilder.Entity<User>().HasQueryFilter(u => !u.IsDelete);
             modelBuilder.Entity<Api>().HasQueryFilter(a => !a.IsDelete);
-            modelBuilder.Entity<Apipackage>().HasQueryFilter(x => x.IsDeleted);
+            modelBuilder.Entity<Apipackage>().HasQueryFilter(x => !x.IsDeleted);
             //配置日志表
             modelBuilder.Entity<Log>().HasKey(x => x.Id);
             modelBuilder.Entity<Log>()

Apimanager_backend/Dtos/ApiInfoDto.cs

@@ -12,5 +12,6 @@ namespace Apimanager_backend.Dtos
         public bool IsThirdParty { get; set; }
         public bool IsActive { get; set; }
         public Apipackage? Package { get; set; }
+        public int? PackageId { get; set; }
     }
 }