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

23
.collaboration
View File

@@ -1866,7 +1866,17 @@
}, },
{ {
"ModuleName": "PCPage/登录画面", "ModuleName": "PCPage/登录画面",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-16T11:14:51.2121472+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\内建页面\\登录画面.json",
"Pages\\内建页面\\登录画面.rd"
]
}, },
{ {
"ModuleName": "Image/有头有绪.png", "ModuleName": "Image/有头有绪.png",
@@ -1874,7 +1884,16 @@
}, },
{ {
"ModuleName": "Image/Clue-Logo.png", "ModuleName": "Image/Clue-Logo.png",
"ModuleType": 38 "State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-16T11:14:51.2082906+08:00",
"ModuleType": 38,
"ToRemoveFiles": [
"image\\图片\\Clue-Logo.png"
]
}, },
{ {
"ModuleName": "Image/Clue-Logo1.png", "ModuleName": "Image/Clue-Logo1.png",