合并冲突

This commit is contained in:
橙子
2022-05-06 22:51:45 +08:00
parent c1d8040fd5
commit 10d512470e
3 changed files with 4 additions and 4 deletions

View File

@@ -32,7 +32,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[Permission($"{nameof(T)}:get:one")]
[Permission($"{nameof(T)}:get:list")]
[HttpGet]
public virtual async Task<Result> GetById(long id)
{
@@ -55,7 +55,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
/// </summary>
/// <param name="queryCondition"></param>
/// <returns></returns>
[Permission($"{nameof(T)}:get:page")]
[Permission($"{nameof(T)}:get:list")]
[HttpPost]
public virtual async Task<Result> PageList(QueryPageCondition queryCondition)
{
@@ -91,7 +91,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
[Permission($"{nameof(T)}:delete:list")]
[Permission($"{nameof(T)}:del")]
[HttpDelete]
public virtual async Task<Result> DeleteList(List<long> ids)
{