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

Merge branch 'abp' of https://gitee.com/ccnetcore/Yi into abp

Browse Source
This commit is contained in:
陈淳
2024-05-16 11:43:35 +08:00
parent 41e202fe7b 269d0c00c5
commit 0b8467c0b0
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -272,3 +272,4 @@ logs
/Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.Development.json
/Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.Production.json
database_backup
/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Staging.json

2
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostCreateInputVo.cs
View File

@@ -8,7 +8,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Post
public Guid Id { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;
public long? CreatorId { get; set; }
public Guid State { get; set; }
public bool? State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string? Remark { get; set; }

2
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Post/PostUpdateInputVo.cs
View File

@@ -5,7 +5,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Post
public Guid Id { get; set; }
public DateTime CreationTime { get; set; } = DateTime.Now;
public Guid? CreatorId { get; set; }
public bool State { get; set; }
public bool? State { get; set; }
public string PostCode { get; set; } = string.Empty;
public string PostName { get; set; } = string.Empty;
public string? Remark { get; set; }

8
Yi.RuoYi.Vue3/src/views/system/user/index.vue
View File

@@ -528,16 +528,16 @@ function submitForm() {
proxy.$refs["userRef"].validate(valid => {
if (valid) {
if (form.value.id != undefined) {
updateUser(form.value.id,form.value).then(response => {
updateUser(form.value.id,form.value).then(async response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
await getList();
});
} else {
addUser(form.value).then(response => {
addUser(form.value).then(async response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
await getList();
});
}
}