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

56
.collaboration
View File

@@ -844,7 +844,17 @@
},
{
"ModuleName": "PCPage/汇报管理",
"ModuleType": 1
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T13:44:46.782513+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\汇报管理.json",
"Pages\\汇报\\汇报管理.rd"
]
},
{
"ModuleName": "Pages/汇报/项目周报",
@@ -1872,19 +1882,55 @@
},
{
"ModuleName": "Image/线性_钉钉.svg",
"ModuleType": 38
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T13:44:46.7820972+08:00",
"ModuleType": 38,
"ToRemoveFiles": [
"image\\图标\\线性_钉钉.svg"
]
},
{
"ModuleName": "Image/微信.svg",
"ModuleType": 38
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T13:44:46.7821004+08:00",
"ModuleType": 38,
"ToRemoveFiles": [
"image\\图标\\微信.svg"
]
},
{
"ModuleName": "Image/企业微信.svg",
"ModuleType": 38
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T13:44:46.7821022+08:00",
"ModuleType": 38,
"ToRemoveFiles": [
"image\\图标\\企业微信.svg"
]
},
{
"ModuleName": "Image/账号登录.svg",
"ModuleType": 38
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-18T13:44:46.7821049+08:00",
"ModuleType": 38,
"ToRemoveFiles": [
"image\\图标\\账号登录.svg"
]
},
{
"ModuleName": "PCPage/登录画面",