xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并冲突

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs
View File

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

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

2
Yi.Vue2.x/src/views/AdmUser.vue
View File

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