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

12
.collaboration
View File

@@ -1579,7 +1579,7 @@
"UserName": "TYFEIKELE\\tyfeikele", "UserName": "TYFEIKELE\\tyfeikele",
"Email": "example@example.com" "Email": "example@example.com"
}, },
"LockDateTime": "2024-06-12T09:54:00.8610481+08:00", "LockDateTime": "2024-06-12T14:29:04.7554787+08:00",
"ModuleType": 7, "ModuleType": 7,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Tables\\汇报\\汇报模板.json" "Tables\\汇报\\汇报模板.json"
@@ -1652,15 +1652,5 @@
}, },
"LockDateTime": "2024-06-12T14:23:49.142921+08:00", "LockDateTime": "2024-06-12T14:23:49.142921+08:00",
"ModuleType": 15 "ModuleType": 15
},
{
"ModuleName": "Table/汇报类型",
"State": 3,
"LockedBy": {
"UserName": "TYFEIKELE\\tyfeikele",
"Email": "example@example.com"
},
"LockDateTime": "2024-06-12T14:25:37.141643+08:00",
"ModuleType": 7
} }
] ]