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

24
.collaboration
View File

@@ -1664,7 +1664,16 @@
}, },
{ {
"ModuleName": "ServerCommand/根据汇报模板生成内容", "ModuleName": "ServerCommand/根据汇报模板生成内容",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-16T14:20:33.602227+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\汇报\\根据汇报模板生成内容.json"
]
}, },
{ {
"ModuleName": "PCPage/日报详情", "ModuleName": "PCPage/日报详情",
@@ -1673,7 +1682,7 @@
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-06-16T12:23:31.2054952+08:00", "LockDateTime": "2024-06-16T14:20:33.6027616+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\汇报\\个人日报\\日报详情.json", "Pages\\汇报\\个人日报\\日报详情.json",
@@ -1682,7 +1691,16 @@
}, },
{ {
"ModuleName": "ServerCommandPrivate/单日自动生成工作日报", "ModuleName": "ServerCommandPrivate/单日自动生成工作日报",
"ModuleType": 27 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-16T14:20:33.6027957+08:00",
"ModuleType": 27,
"ToRemoveFiles": [
"ServerCommands\\汇报\\单日自动生成工作日报.json"
]
}, },
{ {
"ModuleName": "ServerCommands/Gitee", "ModuleName": "ServerCommands/Gitee",