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

156
.collaboration
View File

@@ -9,17 +9,47 @@
},
{
"ModuleName": "Table/FGC_订单记录",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5723876+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "Table/FGC_订单明细表",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5723997+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "Table/FGC_商品表",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724013+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
@@ -188,47 +218,137 @@
},
{
"ModuleName": "TableView/用户信息视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724094+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户组织关系视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724133+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户组织关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/用户角色关系视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724153+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\用户角色关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织信息视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724175+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\组织信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/组织级别视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724192+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\组织级别视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色信息视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.572421+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色信息视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色分类关系视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724236+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色分类关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色拥有权限视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.572427+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色拥有权限视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
"ModuleName": "TableView/角色组织关系视图",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724287+08:00",
"ModuleType": 23,
"ToRemoveFiles": [
"Tables\\用户\\角色组织关系视图.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
@@ -269,7 +389,17 @@
},
{
"ModuleName": "Table/message_test",
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.572432+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\汇报\\message_test.json",
"ForguncyDB.sqlite3"
],
"ExclusiveType": 0
},
{
@@ -1558,7 +1688,20 @@
},
{
"ModuleName": "Upload",
"ModuleType": 26
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5728476+08:00",
"ModuleType": 26,
"ToRemoveFiles": [
"Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png",
"Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png",
"Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json",
"Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png",
"Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png"
]
},
{
"ModuleName": "PublishConfiguration",
@@ -1692,7 +1835,16 @@
},
{
"ModuleName": "Table/Git_事件记录",
"ModuleType": 7
"State": 1,
"LockedBy": {
"UserName": "超哥",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-06-13T16:35:42.5724358+08:00",
"ModuleType": 7,
"ToRemoveFiles": [
"Tables\\Git\\Git_事件记录.json"
]
},
{
"ModuleName": "PCPage/选择Git仓库",