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

22
.collaboration
View File

@@ -1210,7 +1210,17 @@
}, },
{ {
"ModuleName": "PCPage/人员工时统计", "ModuleName": "PCPage/人员工时统计",
"ModuleType": 1 "State": 2,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-10-16T17:18:23.7709048+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\统计\\人员工时统计.json",
"Pages\\统计\\人员工时统计.rd"
]
}, },
{ {
"ModuleName": "MasterPages/流程母版页面文件夹", "ModuleName": "MasterPages/流程母版页面文件夹",
@@ -2531,5 +2541,15 @@
}, },
"LockDateTime": "2024-10-16T17:18:15.3323713+08:00", "LockDateTime": "2024-10-16T17:18:15.3323713+08:00",
"ModuleType": 1 "ModuleType": 1
},
{
"ModuleName": "PCPage/人员工时统计(backup)",
"State": 3,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-10-16T17:18:23.7709235+08:00",
"ModuleType": 1
} }
] ]