admin/clue
1
0
Fork 0
Code Pull Requests 1 Actions Activity

WIP: 将最新版本合并至Master #1

Draft
admin wants to merge 3623 commits from 版本10 into master
pull from: 版本10
merge into: admin:master
Conversation 0 Commits 3623 Files Changed 1005 +118 -2
1 changed files with 118 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 65fa2e690c - Show all commits

120
.collaboration
View File

@@ -21,7 +21,16 @@
}, },
{ {
"ModuleName": "TableView/子任务视图", "ModuleName": "TableView/子任务视图",
"ModuleType": 23 "State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267057+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\任务\\子任务视图.json"
]
}, },
{ {
"ModuleName": "Tables/字典表", "ModuleName": "Tables/字典表",
@@ -101,47 +110,137 @@
}, },
{ {
"ModuleName": "TableView/用户信息视图", "ModuleName": "TableView/用户信息视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267245+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/用户组织关系视图", "ModuleName": "TableView/用户组织关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267265+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户组织关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/用户角色关系视图", "ModuleName": "TableView/用户角色关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.02673+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户角色关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/组织信息视图", "ModuleName": "TableView/组织信息视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.026732+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\组织信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/组织级别视图", "ModuleName": "TableView/组织级别视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267332+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\组织级别视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/角色信息视图", "ModuleName": "TableView/角色信息视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267345+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/角色分类关系视图", "ModuleName": "TableView/角色分类关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267357+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色分类关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/角色拥有权限视图", "ModuleName": "TableView/角色拥有权限视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267377+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色拥有权限视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
"ModuleName": "TableView/角色组织关系视图", "ModuleName": "TableView/角色组织关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267393+08:00",
"ModuleType": 23, "ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色组织关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
@@ -158,7 +257,17 @@
}, },
{ {
"ModuleName": "Table/项目分组", "ModuleName": "Table/项目分组",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267412+08:00",
"ModuleType": 7, "ModuleType": 7,
"ToRemoveFiles": [
"Tables\\项目任务\\项目分组.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0 "ExclusiveType": 0
}, },
{ {
@@ -961,7 +1070,14 @@
}, },
{ {
"ModuleName": "Upload", "ModuleName": "Upload",
"ModuleType": 26 "State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-05T18:46:47.0267908+08:00",
"ModuleType": 26,
"ToRemoveFiles": []
}, },
{ {
"ModuleName": "PublishConfiguration", "ModuleName": "PublishConfiguration",