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

25
.collaboration
View File

@@ -961,7 +961,7 @@
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-17T12:07:14.2096095+08:00",
"LockDateTime": "2024-06-17T12:12:16.676194+08:00",
"ModuleType": 3,
"ToRemoveFiles": [
"MasterPages\\FGC_母版页.json",
@@ -1907,7 +1907,16 @@
},
{
"ModuleName": "Notification/汇报提交提醒",
"ModuleType": 34
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-17T12:12:16.6758467+08:00",
"ModuleType": 34,
"ToRemoveFiles": [
"Notifications\\汇报提交提醒.json"
]
},
{
"ModuleName": "Image/日报.svg",
@@ -2042,7 +2051,17 @@
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-17T12:07:14.2051194+08:00",
"LockDateTime": "2024-06-17T12:12:16.6762386+08:00",
"ModuleType": 15
},
{
"ModuleName": "Notification/登录提醒通知",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-17T12:12:16.6758561+08:00",
"ModuleType": 34
}
]