From 470cc0862c1ad26cee0b8431df8203d835f4917e Mon Sep 17 00:00:00 2001
From: HZG System <HZG System>
Date: Fri, 21 Jun 2024 08:44:06 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"=E7=AD=BE=E5=87=BA=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=20:=20[=E9=A1=B5=E9=9D=A2]=20>=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF,=20[=E9=A1=B5=E9=9D=A2]=20>=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=20>=20=E5=B9=B3=E5=8F=B0=E8=AE=BE=E7=BD=AE=20>=20?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF","MessageType":1,"Modules"?=
 =?UTF-8?q?:[],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/.collaboration b/.collaboration
index 1fe8554a..abb1d5e4 100644
--- a/.collaboration
+++ b/.collaboration
@@ -1941,16 +1941,25 @@
   },
   {
     "ModuleName": "Pages/邮件模板",
-    "ModuleType": 6
-  },
-  {
-    "ModuleName": "PCPage/模板编辑器",
-    "State": 1,
+    "State": 2,
     "LockedBy": {
       "UserName": "超哥",
       "Email": "phoben@qq.com"
     },
-    "LockDateTime": "2024-06-21T07:58:34.1582964+08:00",
+    "LockDateTime": "2024-06-21T08:44:06.7585509+08:00",
+    "ModuleType": 6,
+    "ToRemoveFiles": [
+      "Pages\\邮件模板"
+    ]
+  },
+  {
+    "ModuleName": "PCPage/模板编辑器",
+    "State": 4,
+    "LockedBy": {
+      "UserName": "超哥",
+      "Email": "phoben@qq.com"
+    },
+    "LockDateTime": "2024-06-21T08:44:06.7578995+08:00",
     "ModuleType": 1,
     "ToRemoveFiles": [
       "Pages\\邮件模板\\模板编辑器.json",
@@ -2196,5 +2205,15 @@
   {
     "ModuleName": "ServerCommand/测试回复JSON",
     "ModuleType": 15
+  },
+  {
+    "ModuleName": "Pages/系统/平台设置/邮件模板",
+    "State": 3,
+    "LockedBy": {
+      "UserName": "超哥",
+      "Email": "phoben@qq.com"
+    },
+    "LockDateTime": "2024-06-21T08:44:06.7585559+08:00",
+    "ModuleType": 6
   }
 ]
\ No newline at end of file