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

4
.collaboration
View File

@@ -1268,13 +1268,13 @@
"ModuleType": 24 "ModuleType": 24
}, },
{ {
"ModuleName": "PCPage/FGC_联动页", "ModuleName": "PCPage/客户列表",
"State": 3, "State": 3,
"LockedBy": { "LockedBy": {
"UserName": "SHAMUSPC\\NINGMEI", "UserName": "SHAMUSPC\\NINGMEI",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-03-27T17:01:56.0257256+08:00", "LockDateTime": "2024-03-27T18:47:41.7727264+08:00",
"ModuleType": 1 "ModuleType": 1
}, },
{ {