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

77
.collaboration
View File

@@ -853,7 +853,16 @@
},
{
"ModuleName": "Pages/汇报/日报",
"ModuleType": 6
"State": 2,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T15:23:47.3436311+08:00",
"ModuleType": 6,
"ToRemoveFiles": [
"Pages\\汇报\\日报"
]
},
{
"ModuleName": "PCPage/日报首页",
@@ -871,19 +880,61 @@
},
{
"ModuleName": "PCPage/汇报详情",
"ModuleType": 1
"State": 4,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T15:23:47.3442733+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\日报\\汇报详情.json",
"Pages\\汇报\\日报\\汇报详情.rd",
"Pages\\484d3ed119274a60bf32f15d178cf60.json",
"Pages\\484d3ed119274a60bf32f15d178cf60.rd"
]
},
{
"ModuleName": "PCPage/汇报详情预览",
"ModuleType": 1
"State": 4,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T15:23:47.3443094+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\日报\\汇报详情预览.json",
"Pages\\汇报\\日报\\汇报详情预览.rd"
]
},
{
"ModuleName": "PCPage/导入汇报数据",
"ModuleType": 1
"State": 4,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T15:23:47.3443935+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\日报\\导入汇报数据.json",
"Pages\\汇报\\日报\\导入汇报数据.rd"
]
},
{
"ModuleName": "PCPage/日报助手",
"ModuleType": 1
"State": 4,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T15:23:47.3444399+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\日报\\日报助手.json",
"Pages\\汇报\\日报\\日报助手.rd"
]
},
{
"ModuleName": "Pages/工时",
@@ -1676,12 +1727,12 @@
},
{
"ModuleName": "PCPage/日报详情",
"State": 1,
"State": 4,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T14:56:03.7923456+08:00",
"LockDateTime": "2024-06-15T15:23:47.3445638+08:00",
"ModuleType": 1,
"ToRemoveFiles": [
"Pages\\汇报\\日报\\日报详情.json",
@@ -1863,7 +1914,7 @@
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T14:14:00.6604737+08:00",
"LockDateTime": "2024-06-15T15:23:47.3437946+08:00",
"ModuleType": 1
},
{
@@ -1945,5 +1996,15 @@
},
"LockDateTime": "2024-06-15T15:23:39.1044871+08:00",
"ModuleType": 6
},
{
"ModuleName": "Pages/汇报/个人日报",
"State": 3,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-15T15:23:47.3436358+08:00",
"ModuleType": 6
}
]