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 e3e089e0b0 - Show all commits

16
.collaboration
View File

@@ -1182,7 +1182,17 @@
}, },
{ {
"ModuleName": "PCPage/开发测试", "ModuleName": "PCPage/开发测试",
"ModuleType": 1 "State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-09-19T19:13:03.4425904+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\系统\\开发测试.json",
"Pages\\系统\\开发测试.rd"
]
}, },
{ {
"ModuleName": "Pages/工时", "ModuleName": "Pages/工时",
@@ -1679,7 +1689,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-09-19T19:12:06.453109+08:00", "LockDateTime": "2024-09-19T19:13:03.4426174+08:00",
"ModuleType": 28, "ModuleType": 28,
"ToRemoveFiles": [ "ToRemoveFiles": [
"Process\\项目立项流程.json", "Process\\项目立项流程.json",
@@ -2397,7 +2407,7 @@
"UserName": "cuckooent", "UserName": "cuckooent",
"Email": "phoben@qq.com" "Email": "phoben@qq.com"
}, },
"LockDateTime": "2024-09-19T19:12:29.6617722+08:00", "LockDateTime": "2024-09-19T19:13:03.4385582+08:00",
"ModuleType": 15, "ModuleType": 15,
"ToRemoveFiles": [ "ToRemoveFiles": [
"ServerCommands\\钉钉\\创建项目审批待办.json" "ServerCommands\\钉钉\\创建项目审批待办.json"