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

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

View File

@@ -2242,7 +2242,16 @@
}, },
{ {
"ModuleName": "ServerCommandPrivate/Base根据汇报模板生成内容", "ModuleName": "ServerCommandPrivate/Base根据汇报模板生成内容",
"ModuleType": 27 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-10-18T22:08:29.5940271+08:00",
"ModuleType": 27,
"ToRemoveFiles": [
"ServerCommands\\汇报\\Base根据汇报模板生成内容.json"
]
}, },
{ {
"ModuleName": "ServerCommand/getEmployeeWorkHoursData", "ModuleName": "ServerCommand/getEmployeeWorkHoursData",