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

16
.collaboration
View File

@@ -819,7 +819,7 @@
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:07:53.3324128+08:00",
"LockDateTime": "2024-06-24T21:12:35.1699156+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报管理.json",
@@ -1756,12 +1756,12 @@
},
{
"ModuleName": "PCPage/个人日报列表",
"State": 1,
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:07:53.3322378+08:00",
"LockDateTime": "2024-06-24T21:12:35.1696639+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\个人日报\\个人日报列表.json",
@@ -2231,5 +2231,15 @@
},
"LockDateTime": "2024-06-24T21:07:53.3324226+08:00",
"ModuleType": 1
},
{
"ModuleName": "PCPage/汇报列表",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-24T21:12:35.1699257+08:00",
"ModuleType": 1
}
]