From ecec3abe36e3921f4e73b73f0d3d3cb0eb5c83cd Mon Sep 17 00:00:00 2001
From: "DESKTOP-P7DCA12\\ZhuanZ" <269252963@qq.com>
Date: Wed, 3 Jul 2024 18:10:00 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?=
 =?UTF-8?q?te":1,"Type":31,"Name":"UserControlPage/=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration                           | 14 +-------------
 Pages/21293af3013f474faf264d978cf3501.rd |  8 ++++----
 UserControlPages/聊天列表.json           | 10 +---------
 UserControlPages/聊天列表.rd             |  8 ++++----
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/.collaboration b/.collaboration
index 7785f6f2..7f198eb6 100644
--- a/.collaboration
+++ b/.collaboration
@@ -914,19 +914,7 @@
   },
   {
     "ModuleName": "UserControlPage/聊天列表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "DESKTOP-P7DCA12\\ZhuanZ",
-      "Email": "269252963@qq.com"
-    },
-    "LockDateTime": "2024-07-03T18:09:30.038306+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\聊天列表.json",
-      "UserControlPages\\聊天列表.rd",
-      "Pages\\21293af3013f474faf264d978cf3501.json",
-      "Pages\\21293af3013f474faf264d978cf3501.rd"
-    ]
+    "ModuleType": 31
   },
   {
     "ModuleName": "ServerCommands/任务",
diff --git a/Pages/21293af3013f474faf264d978cf3501.rd b/Pages/21293af3013f474faf264d978cf3501.rd
index 3fe264ae..a7a342aa 100644
--- a/Pages/21293af3013f474faf264d978cf3501.rd
+++ b/Pages/21293af3013f474faf264d978cf3501.rd
@@ -1,5 +1,5 @@
-{
-  "PageType": 2,
-  "ColumnCount": 1,
-  "RowCount": 10
+{
+  "PageType": 2,
+  "ColumnCount": 1,
+  "RowCount": 10
 }
\ No newline at end of file
diff --git a/UserControlPages/聊天列表.json b/UserControlPages/聊天列表.json
index c48de4b7..6af97d58 100644
--- a/UserControlPages/聊天列表.json
+++ b/UserControlPages/聊天列表.json
@@ -225,14 +225,6 @@
                 "GUID": "1bc0eec5-ca8a-44bd-b0db-6900eebd93ca"
               },
               "ColumnName": "创建日期"
-            },
-            {
-              "GUID": "eb108c13-3e0a-4085-8b0a-95160d16d7b3",
-              "Formula": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=IF(LEFT(聊天列表!角色,4)=\"user\",1,0)"
-              },
-              "ColumnName": "是否自己"
             }
           ],
           "OrderBySqlCondition": {
@@ -454,4 +446,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//K/mKpJ3MseVBs8cRhtNnwD/mmOCvYmJIBT+cetpou7ScKmoIPz/mvvZQpWC0vgd67MX8yhrCz73aI2wNf3Sn4qRsGHhbYNsnrx+421sZZ9OGDDqdYpXFI4fN9f9uNpbhk7rFrsGf077QQPW72c+5erEbPeH1haXamslJL9mI/7UtcETB7z06hrzgpYK3Itb1tGtJY1EN9omdkixUgAIK0euCG+lZXDRKYIdBfqsKZq1dEjoFhShbX4DdkFdgJHzhbp0RT0AU+H0Zv4QVXIVxXqpRXedf0RsWJEcnPKNd8gMclwU6oDKgqyP/mh0tdLrxXh4yPAs57/xUQWbEClS8z3+1NBSd6sd0X2DzuJo6fku8yl4mNCdTMdxGK0eNhoDceIbfprFJJt4A6DVuEV72QJzh2GSsq1xVj4uM0gShhe2u/V2lM3YySqwYWweIVudxN9ixFnP1OSeRxkwG9U+WqJYzS4Elrr0ZNPdb/n6aMTjx6qWNpoaFWPELFDDBpMNQTLLNZp56Jsg2tvMkxxfz9ut+IehGbkYRmGWzaAkssPdv0AGEJp+NSffH72S7RT3hm0LxzucHKR/Ds9Un6LK4jEvmGFxj2K55EuZ3Coexk67O9fDGuYteuhz380SDMJVvMqzmI5+yMx8YsrzVBpAJ64lSR7rUQtwxrqRfuGcwrNYjkG24oGo8vEQ/o+wC+5brRJap53Ie/Qh4s4dg1KsOlC0igUeWBdkq9ZC9z3pREi8N/pR/Ndjz9Rrx1m+5GiYBwe+6wU+I6B9u0lvtYXaUj5VHCe+WC9cgrE74mQ2mL3YfriKdT0dZjczyoFd8+4r1GRVVOWoIFV11/P4bDzPSqbNMSiTxCfuTc2XU+w4fgNGPmnHiWwVbBZ3mizOcT6xTWGnRUZcKOydbHhYbPD4Pjw==|920
\ No newline at end of file
+}//TD1oH5Xc9o4ghJ77x7afhhduWOkmr5WYWdVpOVz9G8foDhM31kSP6H5iQMVFF+gIpChgUH+v7IfDLZe8YoseYGwHk12o7TJPwnOprCyEqPg4MkHFoWMqorIUw9/HtAdh/5Sf1KIFNKA+pdtKgfqNas6ntsc4Rj0yuxANBsJjEApZWgdL1/6FFMqlpmBo/ZRPBFlPtfVm3aZdNPd6b5PnI50yGDfmLyEatOFENefLISzJj+AZvJMxgNYK/MxMRW9KGAje7tM9XfxL8Rhf3csK225Kk3/akkxuEF985xyy+utv8y2wrgpZal46IwYHbStZesJjxO1OBvNn5a2OZuBYRXkMFbcDGbKZK6EwO1Ye6gV+hw2nBh9CauVM+AIi3KK+/MVid03roMg5lYARbegFetNRzqlDqamtW0KH8TBZMDAoLV8KKrNcV+77IZm9851J/HH7PUFE8xdTEcCRP20NBo+4/6OEChpeWpevIkh5qD91rIW617f40mwzEJq6N3PiU66LfsM+an8ZV1jkZw7JVHXDDF2LeB0C/8KSDgysu/lutOGrKdBjM4YApJAD3Tkl1XFpJwVPx1qJM5qEmd1wAxTkJRhGidC0unlbizP/VyJUxES/hL9/FZ7QTlrzfWpymFxaUTM24os0hvMiJhFcBNi0+QXQDoBG8lbkIntIv+nlLyS6p1wJPBXVGYXRSUkG/pTKMo9Zyj/16g1Um1t1E14k/33vAuDreq50iTciCttCmSZuqUvDy1mIbkvn16ukr3tiuMK1BQHCXMbk/AuEA+cHkb1Yz2Bd93ac//oWVkD3h3I4wWTjFzETjMttFgYkbKvUPJ9jZKY8OWZuZoHsxgLyS6G+qiXopUQAS8ti4zt3P53aZK6sXEyQIATGkNoQsAkATKJtTK9fTzabdZozTA==|920
\ No newline at end of file
diff --git a/UserControlPages/聊天列表.rd b/UserControlPages/聊天列表.rd
index bbeb3229..543b9997 100644
--- a/UserControlPages/聊天列表.rd
+++ b/UserControlPages/聊天列表.rd
@@ -1,5 +1,5 @@
-{
-  "PageType": 3,
-  "ColumnCount": 28,
-  "RowCount": 2
+{
+  "PageType": 3,
+  "ColumnCount": 28,
+  "RowCount": 2
 }
\ No newline at end of file