WIP: 将最新版本合并至Master #1

Draft
admin wants to merge 3623 commits from 版本10 into master
Showing only changes of commit b894c39d02 - Show all commits

View File

@@ -1507,7 +1507,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2025-04-08T09:10:15.1704207+08:00", "LockDateTime": "2025-04-08T09:17:21.2920711+08:00",
"ModuleType": 27, "ModuleType": 27,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\汇报\\发送日报消息到钉钉.json" "ServerCommands\\汇报\\发送日报消息到钉钉.json"
@@ -2716,7 +2716,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2025-04-08T09:10:01.8205816+08:00", "LockDateTime": "2025-04-08T09:17:21.2919846+08:00",
"ModuleType": 27, "ModuleType": 27,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\钉钉\\发送钉钉工作日报.json" "ServerCommands\\钉钉\\发送钉钉工作日报.json"
@@ -2724,6 +2724,15 @@
}, },
{ {
"ModuleName": "ServerCommand/发送钉钉工作日报(页面)", "ModuleName": "ServerCommand/发送钉钉工作日报(页面)",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2025-04-08T09:17:21.2920796+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\钉钉\\发送钉钉工作日报(页面).json"
]
} }
] ]