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 +100
1 changed files with 100 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57831a4c58 - Show all commits

100
.collaboration
View File

@@ -101,47 +101,137 @@
},
{
"ModuleName": "TableView/用户信息视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484468+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户组织关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484491+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户组织关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户角色关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484506+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户角色关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织信息视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484521+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\组织信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织级别视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484535+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\组织级别视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色信息视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484561+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色分类关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484575+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色分类关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色拥有权限视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484596+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色拥有权限视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色组织关系视图",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484608+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色组织关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
@@ -154,7 +244,17 @@
},
{
"ModuleName": "Table/项目分组",
"State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-27T16:53:08.9484404+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\项目\\项目分组.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{