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

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

View File

@@ -2558,7 +2558,16 @@
}, },
{ {
"ModuleName": "ServerCommandPrivate/钉钉事件处理", "ModuleName": "ServerCommandPrivate/钉钉事件处理",
"ModuleType": 27 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-29T09:39:57.4318677+08:00",
"ModuleType": 27,
"ToRemoveFiles": [
"ServerCommands\\钉钉\\钉钉事件处理.json"
]
}, },
{ {
"ModuleName": "Image/默认头像.png", "ModuleName": "Image/默认头像.png",
@@ -2587,7 +2596,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-11-29T09:39:35.253835+08:00", "LockDateTime": "2024-11-29T09:39:57.4317205+08:00",
"ModuleType": 15, "ModuleType": 15,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\项目\\创建项目视频会议_页面.json" "ServerCommands\\项目\\创建项目视频会议_页面.json"
@@ -2600,7 +2609,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-11-29T09:39:43.7878213+08:00", "LockDateTime": "2024-11-29T09:39:57.4317059+08:00",
"ModuleType": 27, "ModuleType": 27,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\项目\\创建项目视频会议.json" "ServerCommands\\项目\\创建项目视频会议.json"
@@ -2720,7 +2729,16 @@
}, },
{ {
"ModuleName": "ServerCommand/重新发起会议", "ModuleName": "ServerCommand/重新发起会议",
"ModuleType": 15 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-11-29T09:39:57.431762+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\项目\\重新发起会议.json"
]
}, },
{ {
"ModuleName": "PCPage/changelog", "ModuleName": "PCPage/changelog",