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

14
.collaboration
View File

@@ -814,12 +814,12 @@
}, },
{ {
"ModuleName": "PCPage/个人工时首页", "ModuleName": "PCPage/个人工时首页",
"State": 4, "State": 2,
"LockedBy": { "LockedBy": {
"UserName": "超哥", "UserName": "超哥",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-06-27T09:08:46.0240475+08:00", "LockDateTime": "2024-06-27T09:09:00.7082338+08:00",
"ModuleType": 1, "ModuleType": 1,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Pages\\工时\\个人工时首页.json", "Pages\\工时\\个人工时首页.json",
@@ -2252,5 +2252,15 @@
}, },
"LockDateTime": "2024-06-27T09:08:24.4600518+08:00", "LockDateTime": "2024-06-27T09:08:24.4600518+08:00",
"ModuleType": 6 "ModuleType": 6
},
{
"ModuleName": "PCPage/付款凭证管理",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-27T09:09:00.7082556+08:00",
"ModuleType": 1
} }
] ]