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

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

View File

@@ -186,7 +186,17 @@
}, },
{ {
"ModuleName": "PCPage/修改报工", "ModuleName": "PCPage/修改报工",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-03-28T20:32:27.6447212+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\任务\\工时\\修改报工.json",
"Pages\\任务\\工时\\修改报工.rd"
]
}, },
{ {
"ModuleName": "PCPage/新增报工", "ModuleName": "PCPage/新增报工",