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

6
.collaboration
View File

@@ -870,7 +870,7 @@
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-18T17:00:39.5287919+08:00",
"LockDateTime": "2024-04-18T17:33:19.0974298+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报详情.json",
@@ -1675,13 +1675,13 @@
"ModuleType": 15
},
{
"ModuleName": "ServerCommand/报工数据转日报",
"ModuleName": "ServerCommand/AI报工数据转日报",
"State": 3,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-04-18T17:00:39.5281886+08:00",
"LockDateTime": "2024-04-18T17:33:19.0968175+08:00",
"ModuleType": 15
},
{