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

23
.collaboration
View File

@@ -886,7 +886,17 @@
}, },
{ {
"ModuleName": "PCPage/汇报详情", "ModuleName": "PCPage/汇报详情",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2025-04-08T09:41:54.6077573+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报详情.json",
"Pages\\汇报\\汇报详情.rd"
]
}, },
{ {
"ModuleName": "PCPage/汇报详情预览", "ModuleName": "PCPage/汇报详情预览",
@@ -2715,6 +2725,15 @@
}, },
{ {
"ModuleName": "ServerCommand/发送钉钉工作日报(页面)", "ModuleName": "ServerCommand/发送钉钉工作日报(页面)",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2025-04-08T09:41:54.6028627+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\钉钉\\发送钉钉工作日报(页面).json"
]
} }
] ]