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

12
.collaboration
View File

@@ -1212,7 +1212,17 @@
}, },
{ {
"ModuleName": "PCPage/人员工时统计", "ModuleName": "PCPage/人员工时统计",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-08-30T21:31:30.8988133+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\工时\\人员工时统计.json",
"Pages\\工时\\人员工时统计.rd"
]
}, },
{ {
"ModuleName": "MasterPages/流程母版页面文件夹", "ModuleName": "MasterPages/流程母版页面文件夹",