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

4
.collaboration
View File

@@ -1850,12 +1850,12 @@
}, },
{ {
"ModuleName": "ServerCommand/上报实际工时(备份)", "ModuleName": "ServerCommand/上报实际工时(备份)",
"State": 1, "State": 2,
"LockedBy": { "LockedBy": {
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-06-17T20:57:40.08346+08:00", "LockDateTime": "2024-06-17T21:19:20.6287018+08:00",
"ModuleType": 15, "ModuleType": 15,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\工时\\上报实际工时(备份).json" "ServerCommands\\工时\\上报实际工时(备份).json"