合并冲突

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs

@@ -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)
         {

Yi.Vue2.x/src/views/AdmUser.vue

@@ -104,7 +104,7 @@ export default {
     axiosUrls: {},
     headers: [
       { text: "用户名", value: "userName", sortable: false },
-      { text: "密码", value: "password", sortable: false },
+
       { text: "图标", value: "icon", sortable: false },
       { text: "昵称", value: "nick", sortable: true },
       { text: "邮箱", value: "email", sortable: true },