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

11
.collaboration
View File

@@ -1398,7 +1398,16 @@
}, },
{ {
"ModuleName": "ServerCommand/计算报工数据", "ModuleName": "ServerCommand/计算报工数据",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-09-05T17:48:29.1800108+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\工时\\计算报工数据.json"
]
}, },
{ {
"ModuleName": "ServerCommand/上报实际工时", "ModuleName": "ServerCommand/上报实际工时",