diff --git a/.collaboration b/.collaboration
index 36885054..5d87fbed 100644
--- a/.collaboration
+++ b/.collaboration
@@ -526,17 +526,7 @@
   },
   {
     "ModuleName": "PCPage/新增报工",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-29T16:46:47.5226043+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/分配计划工时",
@@ -668,17 +658,7 @@
   },
   {
     "ModuleName": "PCPage/项目成员详情",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-29T16:27:26.8022725+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员详情.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\项目成员\\项目成员详情.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/项目版本",
@@ -1558,16 +1538,7 @@
   },
   {
     "ModuleName": "ServerCommand/AI对话",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-24T17:28:19.9776726+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\AI\\AI对话.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommands/用户",
@@ -2279,50 +2250,7 @@
   },
   {
     "ModuleName": "Plugin",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-29T16:47:25.1869357+08:00",
-    "ModuleType": 40,
-    "ToRemoveFiles": [
-      "Plugin\\DingTalkPlugin.zip",
-      "Plugin\\Echarts图表-10_0_3_0.zip",
-      "Plugin\\Editormd-6_0_102_0.zip",
-      "Plugin\\Forguncy.CustomMenu.zip",
-      "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip",
-      "Plugin\\JSON数据源-10_0_2_0.zip",
-      "Plugin\\Lottie动画插图-10_0_2_0(1).zip",
-      "Plugin\\Notiflix-9_0_103_0.zip",
-      "Plugin\\OPENAIFORGUNCY.zip",
-      "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip",
-      "Plugin\\ReadLogs.zip",
-      "Plugin\\SqlServerWrapper.zip",
-      "Plugin\\Tiny富文本编辑器-10_0_2_0.zip",
-      "Plugin\\UI操作工具箱-9_0_103_0.zip",
-      "Plugin\\Unlayer-9_0_103_0(1).zip",
-      "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip",
-      "Plugin\\内容编辑器-9_0_103_0.zip",
-      "Plugin\\发送HTTP请求命令-10_0_2_0.zip",
-      "Plugin\\取消当前行-9_0_103_0.zip",
-      "Plugin\\增强关闭页面-9_0_6.zip",
-      "Plugin\\复制到剪贴板-7_0_3_0.zip",
-      "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip",
-      "Plugin\\富文本编辑器-10_0_2_0.zip",
-      "Plugin\\对象与集合操作工具-8_0_0_0(1).zip",
-      "Plugin\\应用服务器操作工具集合-8_0_3_0.zip",
-      "Plugin\\异步运行命令-9_0_103_0(1).zip",
-      "Plugin\\支持预览的附件上传-10_0_2_0.zip",
-      "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
-      "Plugin\\模板引擎操作库-9_0_103_0.zip",
-      "Plugin\\用户管理命令 V2-10_0_5_0.zip",
-      "Plugin\\网络操作库-9_0_102_0.zip",
-      "Plugin\\设置当前行命令-10_0_2_0.zip",
-      "Plugin\\设置焦点命令-10_0_2_0.zip",
-      "Plugin\\豪~豪插件合集-7_0_102_0.zip",
-      "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip"
-    ]
+    "ModuleType": 40
   },
   {
     "ModuleName": "PublishSetting",
@@ -2502,16 +2430,7 @@
   },
   {
     "ModuleName": "ServerCommandPrivate/订阅钉钉回调事件",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-24T16:45:16.7353086+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\钉钉\\订阅钉钉回调事件.json"
-    ]
+    "ModuleType": 27
   },
   {
     "ModuleName": "Tables/会议",
@@ -2527,17 +2446,7 @@
   },
   {
     "ModuleName": "PCPage/发起钉钉项目会议",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-24T17:28:51.2281447+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\共用\\发起钉钉项目会议.json",
-      "Pages\\共用\\发起钉钉项目会议.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "ServerCommand/服务端命令3",
diff --git a/Pages/共用/发起钉钉项目会议.json b/Pages/共用/发起钉钉项目会议.json
index 05bddd24..14e5923c 100644
--- a/Pages/共用/发起钉钉项目会议.json
+++ b/Pages/共用/发起钉钉项目会议.json
@@ -410,7 +410,7 @@
                             "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
                           }
                         ],
-                        "ID": "69256b9b-5c21-471c-b2b6-e3c60abf243f"
+                        "ID": "127dcd2e-cec1-4c76-9d80-67d87eb8e638"
                       },
                       {
                         "CommandList": [
@@ -425,12 +425,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "2c78b72d-7210-47f3-8ee2-170daa3a07be"
+                        "ID": "eacf0198-e974-4545-aa33-39a94f5151b3"
                       }
                     ]
                   }
                 ],
-                "ID": "7696250f-84ad-488b-b5f6-4507be2c6448"
+                "ID": "28e1d6a1-45c6-485d-bf94-c066574946f1"
               }
             ]
           }
@@ -592,4 +592,4 @@
       "Formula": "发起钉钉项目会议!$B$6"
     }
   ]
-}//IfKIDt3gNTMxUJRbUHS3WQ5rq/zGhRPiVrqh81M3jE+N9nVbZOekTUpAFsMvrmvartxopNf2FMQRTRa6RariwnfNkbfCy1E8+iwy2K5tvTFzRCRQag9PyprLpyvGyYCU13odMjTS3Wr6Py3e8hZtteFsUk6ETB5pnCahKjGCCdSb/uRwfTp7ibEmFxPN+mjvvDiLcEnaaartu/aJaH2Nkt2yW3jaTGpCb9ir0JZb2FdBw+WH3CopSvcYdD3XsOfdzOK6VnCCjVvb1V4q/P7DzkDP5K+PSmrOe5sVUftBymEjFUD2Hy6ItUsNBMwNf4cq2V0fkznMZwILJ+OnzDRqedFENQNqecI5XjTUvBcluE4f6MctNBzohgIhGPlj4uYteabaR/xtQyXk/wFmZo+5TDgIx9FIP01txZHikBnsEzQpYwhDvHslZk69xAZeJuwWW3r4mU+xQBMT4iwIQ22VQmWp5f6rHCCCCExvyEsK1miSjzQRMikR3s+q1L6UXqt4PdTH/D0V1AkvkYWTN9RNPVYophI+N1mI6SA40V/1H1y+e7RxLM30O85RfZBfWdO6EP+rt3o1BxgdRwQ4aiymKwaY2Bd83xSiBOQM2llONVVd4t3CTSI77dgXGRPUitMwtT9gbYbaYEFep7DqjdtZ74PqsSnH3oxl1ckuv9eAXNVjdYwYTNmdOUI9RFY5oquD+kwa/S8rOX9JuMD+ZQ4v1XLYArPSugXxbhhOGuEXk3nPgDbLZ1F1gG5uO4wNvsR0YxpL7XczAihvWB+5+QMc3r8cm9/xOjFZOj6MHqoX+OHcMePH6JjL1o6/x34KJfje4PqkZq7ZQ3JWrVW/7EsTXqVfmbBe5WzbZcwhB3LOc1SShbzGJWbT2VlBsvNYzdBUv3ErwFhCamO1DKGpRl9bcg==|920
\ No newline at end of file
+}//sKu7/dVhJmoAssP9Fc14CAg3u+ag2OosQQ36IFi7HZP1PSpAdFIAupMkqRxHj9chIE/TXeB4tSsw787tIR3WR8CcggC9PGcFZdSlB3pHpSnkuMmzBO0w9nS45yuSzoFr31jtKEgaSSKrxUSdSdEJ4fzyr2j6xqfNYvr+p296PoT53qmyxzulV4wZpHyq+hwrJ5LSNVmV5csAsWxcqMqpcEb5p6xmNF/aeAwbmx4WKXTuOx5bV7GqbzRDuUxI6nR3yV7ij/valR/PevfKEHW2zJde4pJa4rE67WpuGaCpw8Cg84NGU+ms9xGvpwQX1tfavlrYmhpkzXv63Ym5ALIO7JutK59xoaa/X2bQ64w0/RABKwm+XN8C5oNgxza/9MqWqx/RmSuLaZojRvCDiWY1Qw56s0Wx85bXnPojni54nrTlyKk70Cpk7i+Jh092Kc8ltuKpPqUsYGcuDA1BoTuQ4sGJnTMQs522I3w4VK+VaeMGCzvWVkMD2NphtMlWn53pmD/5zezeOHZ13avtTlqHlFqGXvqRisaUdGJbZOMVCx3ynUuJnaVwga97j+FbrO2nRoFsQUsyZs58j3G1oZJWZwQ8Y8a3nyreH715pPhivrvBVSsBZMTjWj1rcY47OYfRKc44zO6cYaTRZ4ZBDSM8gFY6tifEGOpexvJr2IWkIblKDpxOu4AIFWeJCWcl9lztN9yDwQnvdlSB57pi116qi+loksR9NV/v/X7e0FELtxUF4UJjujuuWPguBx79rQyT30kf36unjrM2QL0nJW6EtOELh85Bhj7IMWgGGvCOs+rHP2xpjA/H/ohywnKNQ0m4btNWZUh2to0jhlW7kKNpoTP0pKWt92dya91dEWY0+IPFcqFDReK9bZZta65go1PWw/IgGPFbb2lyadKpRbRdqg==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
index 0a9e1c5d..25b76d8e 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json
@@ -584,7 +584,7 @@
                     ]
                   }
                 ],
-                "ID": "712d0cba-f1ed-4ba8-abb6-c70bdcddbd18"
+                "ID": "732df9c2-b4ee-4a00-bacb-68361be568dc"
               }
             ]
           }
@@ -763,7 +763,7 @@
                                           "LoadBindingDataOption": 1
                                         }
                                       ],
-                                      "ID": "d2559dbf-d655-4e63-88c1-2e43ae8d71c3"
+                                      "ID": "16a3236c-be7f-464b-94f7-81a75066edda"
                                     },
                                     {
                                       "CommandList": [
@@ -900,7 +900,7 @@
                                                   ]
                                                 }
                                               ],
-                                              "ID": "a5f63927-9a9c-4dd8-a34b-859bcf8329e0"
+                                              "ID": "98fb39b5-2d34-4d82-b786-ff773de66b55"
                                             },
                                             {
                                               "CommandList": [
@@ -913,7 +913,7 @@
                                                   }
                                                 }
                                               ],
-                                              "ID": "a86072ba-b3ba-4b79-9856-dcd973da79ef"
+                                              "ID": "b250e704-2349-43ab-b79e-931f5a882b78"
                                             }
                                           ]
                                         },
@@ -927,12 +927,12 @@
                                           "Title": "加载中"
                                         }
                                       ],
-                                      "ID": "274d59f5-b2e4-447b-ba2f-19cd3dbc10a1"
+                                      "ID": "433a31d0-064a-4846-b3cb-394f83a597c1"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "310784e0-5f67-4225-9f59-fd73e95c32b6"
+                              "ID": "2daa46ad-1f88-4cdc-bdf9-35c00e5a91ea"
                             },
                             {
                               "Condition": {
@@ -1105,7 +1105,7 @@
                                                         ]
                                                       }
                                                     ],
-                                                    "ID": "96a5cf48-4417-41b9-bd90-0534baa7a941"
+                                                    "ID": "2a357101-eef2-4b00-91b2-01229aae92b7"
                                                   },
                                                   {
                                                     "CommandList": [
@@ -1114,12 +1114,12 @@
                                                         "Message": "无反馈内容"
                                                       }
                                                     ],
-                                                    "ID": "acef094e-44e4-4222-937c-99234e17eed7"
+                                                    "ID": "b4fdd394-69e2-4ff3-8569-f55af2a31a02"
                                                   }
                                                 ]
                                               }
                                             ],
-                                            "ID": "4b32ba59-054b-4f5a-b88b-9fda42fad1e6"
+                                            "ID": "98d2f19e-2df8-413f-8025-76f53014de92"
                                           }
                                         ]
                                       }
@@ -1173,12 +1173,12 @@
                                   ]
                                 }
                               ],
-                              "ID": "ed4d6d92-801b-47b5-bd3c-2f262b985466"
+                              "ID": "fb54ebe3-d93a-45e8-9007-e83905b2180b"
                             }
                           ]
                         }
                       ],
-                      "ID": "8a59ad98-ee94-4bb0-b713-41018a1ad5f2"
+                      "ID": "4b66ee27-7fd2-4368-9979-8d49ee3917ad"
                     }
                   ]
                 }
@@ -1508,7 +1508,7 @@
                                           "ReloadData": true
                                         }
                                       ],
-                                      "ID": "ee5f01da-2e6f-40c1-a033-4230e487a78d"
+                                      "ID": "e8b3e226-1e82-461c-be6c-f2e8afc22355"
                                     },
                                     {
                                       "CommandList": [
@@ -1523,12 +1523,12 @@
                                           "BtnText": "知道了"
                                         }
                                       ],
-                                      "ID": "4308ac44-43e5-4b71-b6be-5eb2ecec8968"
+                                      "ID": "48f45f21-cafd-40d9-bd3a-e57c8676bf04"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "63ceed8c-feec-4aac-8c22-16ff8765deab"
+                              "ID": "eb68d8d6-b99d-4be7-b89c-a7079aa2070b"
                             }
                           ]
                         }
@@ -1614,7 +1614,7 @@
                     ]
                   }
                 ],
-                "ID": "50c228b2-2db7-4aa9-95ec-c668067f946d"
+                "ID": "def2d3d0-b835-4f24-b18c-f798769790bf"
               },
               {
                 "CommandList": [
@@ -1629,7 +1629,7 @@
                     "BtnText": "知道了"
                   }
                 ],
-                "ID": "75b4f89f-46f9-47bb-aa08-b8df20e09a8a"
+                "ID": "af659524-7dac-4f20-b8f7-369e74171375"
               }
             ]
           }
@@ -1676,6 +1676,13 @@
         }
       }
     },
+    "30,8": {
+      "BindingInfo": {
+        "TableName": "项目平行视图",
+        "ColumnName": "项目经理",
+        "GUID": "3fc6f831-d0e8-482e-81bb-e3945ce4820e"
+      }
+    },
     "31,1": {
       "BindingInfo": {
         "TableName": "任务表",
@@ -2012,7 +2019,8 @@
     "30,4,1,3",
     "31,1,1,3",
     "2,1,1,17",
-    "29,1,1,4"
+    "29,1,1,4",
+    "30,8,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -2022,16 +2030,47 @@
         "ConditionAndCommandPairList": [
           {
             "Condition": {
-              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-              "param": {
-                "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
-                "currentUserProperty": {
-                  "UserProperty": "角色",
-                  "PropertyType": 3
+              "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+              "SubConditions": [
+                {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
+                    "currentUserProperty": {
+                      "UserProperty": "角色",
+                      "PropertyType": 3
+                    }
+                  },
+                  "value": "项目总监",
+                  "compareType": 10
+                },
+                {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
+                    "currentUserProperty": {
+                      "UserProperty": "用户名"
+                    }
+                  },
+                  "value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=新增报工!项目经理"
+                  }
+                },
+                {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
+                    "currentUserProperty": {
+                      "UserProperty": "角色",
+                      "PropertyType": 3
+                    }
+                  },
+                  "value": "Administrator",
+                  "compareType": 10
                 }
-              },
-              "value": "项目总监",
-              "compareType": 10
+              ],
+              "RelationType": 1
             },
             "CommandList": [
               {
@@ -2047,7 +2086,7 @@
                 ]
               }
             ],
-            "ID": "1617b46c-c7e9-406a-b37f-d87c856a7a95"
+            "ID": "87c45311-8654-4d7e-9e3e-edc3fa285011"
           },
           {
             "CommandList": [
@@ -2064,7 +2103,7 @@
                 ]
               }
             ],
-            "ID": "687c5eac-ad49-401d-8031-681cd16acda4"
+            "ID": "01d9b42d-6c33-4059-96aa-5e35726aee3b"
           }
         ]
       }
@@ -2134,6 +2173,10 @@
     {
       "Name": "项目ID",
       "Formula": "新增报工!$B$30"
+    },
+    {
+      "Name": "项目经理",
+      "Formula": "新增报工!$I$31"
     }
   ]
-}//Vp9U0Vq/4fr+g1P9vuypVOxUsXR8Yzi9Qo02/wVxr2y797og45XnktmIyINgYbgmws+CJkEqPeDJd8PHF6VeabdJOmr6lkl9E5Fbs4hl4eahc7M2ehPLHMVzxCMHrHUWDCmwffwlanKeob2n+jr8JNgyS0w7BPT5r9SLwG4kWvyqrQYn6iZcbbbiDs0Wo0Uj1ELdGSFJJj8A8oTfwEmoYhgd+JkAqTl/u9FURZYujX/AOHpJKxsH8POw92g8qsIjmSvhXp6SvdXwmJD9yi/7rXp1/MwLGH/chDa66qg0oWWbPgP48TW5djbHYYX9xPrLwZrX7Oo6OAxT+JyX9kL2KSmcHmb8igGDNYYARg4fFt8KuJspeBWLv8Vb9Fe98pNdptDMw+Dw6x9arDtsS8uQDkl8zEvQ1r5u4mFmCKDUCvWnjtC7Jbkom5EaQTldiuecQ3IArqiepQJfdTZdi8GWXdA8PHzqmxivwyI/2ayuAqip3LvkW2hT6243TpnPGvcUx/Xw09zf2R1p9jKLVmZ5IXmqnvobdTdqebPn0RIKhW597WFCjcFhTpi28lMAVRkwBGHKtC3v8Of+LpJb4digYrykPlid4VpjpWGH8wcebXWL3CZTvn3xDW4h3oud5K9d2lxsDA73kIaF817G/rQTCa06PDkv+XifU63THYSBK2y1kt6Yq0hplyrMMlYZDs+f2FlAKANNxprH0sj2L6tO1lMbwU2Oxax9h6S2e/msYRBXlaLqqkkqNHFNiZYpK3dMIwE4rgmHavWLcISv1RxjkovkmLGAsZHutbYWOWv58u+kj1ngmZ+pBJFMzx+egh9Z6koyePCflKRgQfyDvydLkMEKvbe+/Ibfqu0Kf2rpiLK6TcHktX1HYppZuBlfq9L56aVmC5qQKCmXOEYFU7cEEw==|920
\ No newline at end of file
+}//w2aTsK1iIgA8EMK/I0av1Q/1/erp96BTFdJD2FQ88Prq9pcx7WQH7iimC8oIHz7by8c4AXSyNaLKW7Xh8NpQakxEJOCk+oaJqJWLuVHrsiVEzetbP813p2kPi44ePsuv30ArpOpuqeqWsrIV7g02b510AGVCUFKtxx7E3gZjZmTG44cBnc9x7mjbYqEj+6LHnueVLUDvm+YgX4JOzfxd2NjFnLXuiLfZoiiUvwKUFU+VQmoseQiDHGKv54AODmLkDTyKNjvI7v60wRmlQ6XCluAjcdzNVhgAGsOFG7xH+7AdYAQSz1tdhwC5PgI9jluWqKSFFTpJjUpDdq5mRuRGkp9FGIYDrpgYbmbE2/PdT+d4xca0Xl0n+9sLr4yoUlsg+0NT4ECQc922uCBLvYKfXYFKSJlasZoFcQ1LrHeG2a9tpwUcpbHj17/nnyiGkyT1G3updnhDHgDAsCb228OFXxKQueP4od2oMZ7OY0qob3lozcY7wry867RHXNLcim3sg2EsglcKDph00DccPafYBPTJaQ+yrSqIBb3pjI1TSGy/le7fVqbFbbxC2gMAK9l6rc7bCKQ8/9y455FEiMdZnOSGsmjlxBIZZwWVAYikHtsJqFKf7fARBE0L4WtJdBCnbRUSBgdkldCYm6x5a4tYKJ0SYamWGmiKfa4ekH2Ar4P4B+mdTk8nNn55JKPm466+NeHA6yGxHt1Te030SuomwNrxoVvmuqaepgEHBSWCPUQiuNoggMxel/oKWPyTecziQACcY2CoaF1Tiv8GvNJ/PkmvpjAwjRLukdCajAUq+KKnNXR8La6HmvH3byU4TJPmdeYK22RrA9+AcFGKO/gTtB56uOh+wr+HIQWLSsuJdY80DPxztIxU3agSefYRDQiqcEAVY1w5Skdil/0aBgpvAQ==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd
index 5a4aa45c..e5fcc626 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.rd
@@ -45,6 +45,10 @@
     {
       "Name": "项目ID",
       "Formula": "新增报工!$B$30"
+    },
+    {
+      "Name": "项目经理",
+      "Formula": "新增报工!$I$31"
     }
   ]
 }
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json
index ae7efbef..69ea1a10 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.json
@@ -21,16 +21,6 @@
           "DesignLengthInPixel": 35.0
         }
       },
-      "6": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "7": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
       "8": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 35.0
@@ -43,7 +33,8 @@
       },
       "14": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
+          "DesignLengthInPixel": 32.0,
+          "IsHidden": true
         }
       },
       "15": {
@@ -54,35 +45,39 @@
       },
       "16": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0,
+          "DesignLengthInPixel": 35.0,
           "IsHidden": true
         }
       },
       "17": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0,
-          "IsHidden": true
+          "DesignLengthInPixel": 32.0
         }
       },
       "18": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "19": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
         }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
       }
     },
     "InLogicalVisibleIndexes": [
+      14,
       15,
       16,
-      17,
-      19
+      18
     ],
-    "Count": 20,
+    "Count": 19,
     "DefaultSize": 32.0
   },
   "Cols": {
@@ -173,18 +168,18 @@
   },
   "Values": {
     "1,1": "成员",
-    "4,1": "默认时薪",
-    "7,1": "岗位",
-    "10,1": "岗位时薪",
-    "10,14": "*优先级高于默认时薪",
-    "11,1": "跟随个人默认时薪",
-    "13,1": "项目时薪",
-    "13,14": "*优先级高于岗位时薪",
-    "17,1": "取消",
-    "17,12": "保存"
+    "4,1": "岗位",
+    "7,1": "默认时薪",
+    "7,9": "岗位时薪",
+    "7,13": "修改",
+    "10,1": "项目时薪",
+    "10,14": "项目时薪>岗位时薪>默认时薪",
+    "16,1": "取消",
+    "16,12": "保存"
   },
   "Formulas": {
-    "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")"
+    "8,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")",
+    "13,1": "SWITCH(AND(B12=\"\",J9=\"\"),B9,B12=\"\",J9,J9=\"\",B9)"
   },
   "AttachInfos": {
     "2,1": {
@@ -276,40 +271,6 @@
       ]
     },
     "5,1": {
-      "BindingInfo": {
-        "TableName": "项目成员表",
-        "ColumnName": "项目成员",
-        "GUID": "f71da0ef-5394-41a0-b91d-a27c8397362c",
-        "AttachType": {
-          "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
-          "UserColumnAttachType": 5,
-          "AttachTypeTag": "默认时薪"
-        }
-      },
-      "CellType": {
-        "$type": "ElementUI.InputNumberCellType, ElementUI",
-        "CommandList": [],
-        "UIPermissions": [
-          {
-            "Scope": 2,
-            "AllowRoles": [
-              "FGC_Anonymous"
-            ]
-          },
-          {
-            "Scope": 1,
-            "AllowRoles": [
-              "FGC_Anonymous"
-            ]
-          }
-        ],
-        "step": 1,
-        "controls": false,
-        "controlsPosition": true,
-        "IsDisabled": true
-      }
-    },
-    "8,1": {
       "BindingInfo": {
         "TableName": "项目成员表",
         "ColumnName": "岗位ID",
@@ -337,7 +298,7 @@
                     "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy",
                     "Cell": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目成员详情!B9"
+                      "SerializeProperty": "=项目成员详情!B6"
                     },
                     "Title": "获取中"
                   },
@@ -367,7 +328,7 @@
                         },
                         "Value": {
                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=项目成员详情!B9"
+                          "SerializeProperty": "=项目成员详情!B6"
                         }
                       },
                       "NullFormulaValueQueryPolicy": 0,
@@ -380,7 +341,7 @@
                     "FunctionName": "remove",
                     "Cell": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目成员详情!B9"
+                      "SerializeProperty": "=项目成员详情!B6"
                     },
                     "Title": "获取中"
                   },
@@ -416,7 +377,7 @@
                               },
                               "value": {
                                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                "SerializeProperty": "=项目成员详情!B15"
+                                "SerializeProperty": "=项目成员详情!B12"
                               },
                               "compareType": 1
                             }
@@ -441,7 +402,7 @@
                                       {
                                         "TargetCells": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                          "SerializeProperty": "=项目成员详情!B15"
+                                          "SerializeProperty": "=项目成员详情!B12"
                                         },
                                         "Value": {
                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -451,17 +412,17 @@
                                     ]
                                   }
                                 ],
-                                "ID": "39c9f1fe-9958-4063-abdd-4714d686489d"
+                                "ID": "9ef60c2c-c511-48fb-aa12-981552cc57f9"
                               }
                             ]
                           }
                         ],
-                        "ID": "e18959c9-be4f-462e-a5d5-499d9b4aa1f5"
+                        "ID": "d0cdc470-7db0-4311-a550-32c795ce6271"
                       }
                     ]
                   }
                 ],
-                "ID": "d35ad6cb-2939-4294-8a31-919bae3285a6"
+                "ID": "0a6ee342-79db-425a-a26e-4a6fc955151f"
               }
             ]
           }
@@ -552,7 +513,99 @@
         "IgnoreBlank": false
       }
     },
-    "11,1": {
+    "7,13": {
+      "CellType": {
+        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                  "SubConditions": [
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                        "tableData": {
+                          "TableName": "项目表",
+                          "ColumnName": "项目经理",
+                          "GUID": "1349038d-3227-41e0-adc0-c413aa262cc8"
+                        }
+                      },
+                      "value": "%CurrentUser.UserName%"
+                    },
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon",
+                        "currentUserProperty": {
+                          "UserProperty": "角色",
+                          "PropertyType": 3
+                        }
+                      },
+                      "value": "Administrator",
+                      "compareType": 10
+                    }
+                  ],
+                  "RelationType": 1
+                },
+                "CommandList": [
+                  {
+                    "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand",
+                    "CurrentRowInfo": {
+                      "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                      "ColumnBindingInfo": {
+                        "TableName": "项目岗位",
+                        "ColumnName": "ID",
+                        "GUID": "af8bce7f-0edc-4194-98f9-27af4cec7bd9"
+                      },
+                      "Value": {
+                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                        "SerializeProperty": "=项目成员详情!O19"
+                      }
+                    }
+                  },
+                  {
+                    "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                    "PageName": "项目岗位详情",
+                    "LoadBindingDataOption": 1
+                  }
+                ],
+                "ID": "ec889e17-03b6-46f2-b6ea-f63558e80e24"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                    "FourStandardStyle": "warning",
+                    "Message": "请联系项目经理修改"
+                  }
+                ],
+                "ID": "1fd9fa76-4960-4f40-8931-9199a4d93e67"
+              }
+            ]
+          }
+        ],
+        "Text": "修改",
+        "ClickMode": 1,
+        "TemplateKey": "_RS_Main"
+      }
+    },
+    "8,1": {
+      "BindingInfo": {
+        "TableName": "项目成员表",
+        "ColumnName": "项目成员",
+        "GUID": "f71da0ef-5394-41a0-b91d-a27c8397362c",
+        "AttachType": {
+          "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
+          "UserColumnAttachType": 5,
+          "AttachTypeTag": "默认时薪"
+        }
+      }
+    },
+    "8,9": {
       "BindingInfo": {
         "TableName": "项目成员表",
         "ColumnName": "岗位ID",
@@ -562,32 +615,9 @@
           "RelatedColumn": "ID",
           "DisplayColumn": "默认时薪"
         }
-      },
-      "CellType": {
-        "$type": "ElementUI.InputNumberCellType, ElementUI",
-        "CommandList": [],
-        "UIPermissions": [
-          {
-            "Scope": 2,
-            "AllowRoles": [
-              "FGC_Anonymous"
-            ]
-          },
-          {
-            "Scope": 1,
-            "AllowRoles": [
-              "FGC_Anonymous"
-            ]
-          }
-        ],
-        "DefaultValue": "跟随个人默认时薪",
-        "step": 1,
-        "controls": false,
-        "controlsPosition": true,
-        "IsDisabled": true
       }
     },
-    "14,1": {
+    "11,1": {
       "BindingInfo": {
         "TableName": "项目成员表",
         "ColumnName": "默认时薪",
@@ -615,11 +645,79 @@
         "controls": false
       },
       "DataValidationInfo": {
+        "NumberType": 9,
+        "ValidateCommand": [
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                  "SubConditions": [
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                        "cellLocations": [
+                          {
+                            "SerializeProperty": "=项目成员详情!B9"
+                          }
+                        ]
+                      },
+                      "value": "%Null%"
+                    },
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                        "cellLocations": [
+                          {
+                            "SerializeProperty": "=项目成员详情!J9"
+                          }
+                        ]
+                      },
+                      "value": "%Null%"
+                    },
+                    {
+                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                      "param": {
+                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                        "cellLocations": [
+                          {
+                            "SerializeProperty": "=项目成员详情!B12"
+                          }
+                        ]
+                      },
+                      "value": "%Null%"
+                    }
+                  ]
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                    "ErrorCode": "400",
+                    "Message": "个人默认时薪、岗位时薪、项目时薪，请至少设置一项"
+                  }
+                ],
+                "ID": "4c96b6e9-2145-4212-b56f-8385d27676b4"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                    "ErrorCode": "0"
+                  }
+                ],
+                "ID": "c5b253bc-4c67-4ef3-b30d-3bef1572f142"
+              }
+            ]
+          }
+        ],
         "InputMessageTitle": "提示",
         "InputMessage": "如果任务没有设置时薪，则采用此处设置的时薪来计算收益"
       }
     },
-    "17,1": {
+    "16,1": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -631,7 +729,7 @@
         "TemplateKey": "_RS_Information3"
       }
     },
-    "17,12": {
+    "16,12": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -711,7 +809,7 @@
                                     ]
                                   }
                                 ],
-                                "ID": "4de565c1-6aca-4d89-b31a-02229013ade3"
+                                "ID": "9b237ed2-a150-4e8a-9b81-d85541e1353d"
                               },
                               {
                                 "CommandList": [
@@ -721,12 +819,12 @@
                                     "Message": "请不要重复添加成员"
                                   }
                                 ],
-                                "ID": "f4da137e-d99c-444e-bda4-b94e5679777d"
+                                "ID": "93009608-6144-4ff8-bca0-9411543e6ba7"
                               }
                             ]
                           }
                         ],
-                        "ID": "06d81d92-edc4-4ab8-9e89-25f8ecbec347"
+                        "ID": "ae109d93-c33e-4399-942a-9b87dbf1c825"
                       },
                       {
                         "CommandList": [
@@ -736,7 +834,7 @@
                             "ShowConfirm": false
                           }
                         ],
-                        "ID": "70d36367-a9da-42a0-99e5-55140fec5bce"
+                        "ID": "4c95f415-1aa0-4792-a95a-d01a31bd416c"
                       }
                     ]
                   },
@@ -758,7 +856,7 @@
                     ]
                   }
                 ],
-                "ID": "1fd3936c-e7b3-4815-8088-b1ebc83301b4"
+                "ID": "6f62be90-492f-45e3-83e4-434ad9150ef5"
               },
               {
                 "CommandList": [
@@ -768,7 +866,7 @@
                     "Message": "请指定项目"
                   }
                 ],
-                "ID": "c618c99e-1054-4252-9d26-d0d2dc2e7264"
+                "ID": "3940a27a-7413-4f67-992e-4dd798b35db1"
               }
             ]
           }
@@ -777,28 +875,28 @@
         "TemplateKey": "_RS_Main1"
       }
     },
-    "19,0": {
+    "18,0": {
       "BindingInfo": {
         "TableName": "项目表",
         "ColumnName": "ID",
         "GUID": "59d90698-39f5-4c8b-bbb9-dadfb4cb5ee5"
       }
     },
-    "19,4": {
+    "18,4": {
       "BindingInfo": {
         "TableName": "项目成员表",
         "ColumnName": "ID",
         "GUID": "314562f3-292a-48d6-ae9b-f410d11976b3"
       }
     },
-    "19,7": {
+    "18,7": {
       "BindingInfo": {
         "TableName": "项目表",
         "ColumnName": "项目成员",
         "GUID": "f8e37c92-932d-4893-8ba6-0af354a81936"
       }
     },
-    "19,11": {
+    "18,11": {
       "BindingInfo": {
         "TableName": "项目成员表",
         "ColumnName": "项目ID",
@@ -809,6 +907,13 @@
           "DisplayColumn": "项目经理"
         }
       }
+    },
+    "18,14": {
+      "BindingInfo": {
+        "TableName": "项目成员表",
+        "ColumnName": "岗位ID",
+        "GUID": "2cb28302-5ac9-4b82-8670-4d8b7b2da614"
+      }
     }
   },
   "StyleDatas": {
@@ -829,22 +934,41 @@
       },
       {
         "FontFamily": 0,
-        "FontSize": 12.0,
+        "FontSize": 13.333333333333332,
         "Foreground": 3,
-        "Formatter": 1,
+        "Formatter": 2,
+        "HorizontalAlignment": 4,
+        "Underline": false
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 16.0,
+        "Foreground": 5,
+        "Formatter": 2
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 16.0,
+        "Formatter": 2
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Foreground": 6,
         "HorizontalAlignment": 4
       },
       {
         "FontFamily": 0,
-        "FontSize": 12.0,
-        "Foreground": 3,
-        "HorizontalAlignment": 4
+        "FontSize": 13.333333333333332,
+        "Foreground": 7,
+        "Formatter": 8,
+        "HorizontalAlignment": 9
       },
       {
         "BorderBottom": 0
       },
       {
-        "Background": 6,
+        "Background": 11,
         "BorderBottom": 1,
         "BorderTop": 1,
         "BorderLeft": 1
@@ -864,18 +988,23 @@
         "Body",
         "[AUTO]General",
         "¥#,##0_);[Red](¥#,##0)",
-        "Text 1 50",
+        "Accent 1 0",
         "Right",
+        "Text 1 0",
+        "Text 1 50",
+        "Accent 4 0",
+        "\"当前成员时薪将以\"0.0\"元/小时计算\"",
+        "Left",
         "Background 2 0",
         "#FFFFFF00",
         "black"
       ],
       "Borders": [
         {
-          "Color": 5
+          "Color": 10
         },
         {
-          "Color": 7
+          "Color": 12
         }
       ]
     },
@@ -909,26 +1038,56 @@
       "4,6": 1,
       "4,7": 1,
       "4,8": 1,
-      "4,11": 2,
-      "4,12": 2,
-      "4,13": 2,
-      "4,14": 2,
-      "5,1": 2,
-      "7,0": 1,
+      "4,9": 1,
+      "4,10": 1,
+      "4,11": 1,
+      "4,12": 1,
+      "4,13": 1,
+      "4,14": 1,
+      "5,1": 1,
+      "5,2": 1,
+      "5,3": 1,
+      "5,4": 1,
+      "5,5": 1,
+      "5,6": 1,
+      "5,7": 1,
+      "5,8": 1,
+      "5,9": 1,
+      "5,10": 1,
+      "5,11": 1,
+      "5,12": 1,
+      "5,13": 1,
+      "5,14": 1,
+      "6,1": 1,
+      "6,2": 1,
+      "6,3": 1,
+      "6,4": 1,
+      "6,5": 1,
+      "6,6": 1,
+      "6,7": 1,
+      "6,8": 1,
+      "6,11": 2,
+      "6,12": 2,
+      "6,13": 2,
+      "6,14": 2,
       "7,1": 0,
       "7,2": 1,
       "7,3": 1,
       "7,4": 1,
       "7,5": 1,
-      "7,6": 1,
-      "7,7": 1,
-      "7,8": 1,
-      "7,9": 1,
+      "7,9": 0,
       "7,10": 1,
-      "7,15": 1,
-      "8,0": 1,
-      "8,1": 1,
-      "8,15": 1,
+      "7,11": 1,
+      "7,12": 1,
+      "7,13": 3,
+      "7,14": 1,
+      "8,1": 4,
+      "8,9": 5,
+      "8,10": 1,
+      "8,11": 1,
+      "8,12": 1,
+      "8,13": 1,
+      "8,14": 1,
       "9,0": 1,
       "9,1": 1,
       "9,2": 1,
@@ -940,10 +1099,10 @@
       "9,8": 1,
       "9,9": 1,
       "9,10": 1,
-      "9,11": 2,
-      "9,12": 2,
-      "9,13": 2,
-      "9,14": 2,
+      "9,11": 1,
+      "9,12": 1,
+      "9,13": 1,
+      "9,14": 1,
       "9,15": 1,
       "10,0": 1,
       "10,1": 0,
@@ -956,13 +1115,13 @@
       "10,8": 1,
       "10,9": 1,
       "10,10": 1,
-      "10,11": 2,
-      "10,12": 2,
-      "10,13": 2,
-      "10,14": 3,
+      "10,11": 1,
+      "10,12": 1,
+      "10,13": 1,
+      "10,14": 6,
       "10,15": 1,
       "11,0": 1,
-      "11,1": 2,
+      "11,1": 1,
       "11,15": 1,
       "12,0": 1,
       "12,1": 1,
@@ -981,49 +1140,39 @@
       "12,14": 1,
       "12,15": 1,
       "13,0": 1,
-      "13,1": 0,
-      "13,2": 1,
-      "13,3": 1,
-      "13,4": 1,
-      "13,5": 1,
-      "13,6": 1,
-      "13,7": 1,
+      "13,1": 7,
       "13,8": 1,
       "13,9": 1,
       "13,10": 1,
       "13,11": 1,
       "13,12": 1,
       "13,13": 1,
-      "13,14": 4,
       "13,15": 1,
-      "14,0": 1,
-      "14,1": 1,
-      "14,15": 1,
-      "15,1": 5,
-      "15,2": 5,
-      "15,3": 5,
-      "15,4": 5,
-      "15,5": 5,
-      "15,6": 5,
-      "15,7": 5,
-      "15,8": 5,
-      "15,9": 5,
-      "15,10": 5,
-      "15,11": 5,
-      "15,12": 5,
-      "15,13": 5,
-      "15,14": 5,
-      "17,1": 0,
-      "17,2": 1,
-      "17,3": 1,
-      "17,12": 0,
-      "17,13": 1,
-      "17,14": 1,
-      "19,0": 6,
-      "19,1": 7,
-      "19,2": 7,
-      "19,3": 8,
-      "19,4": 1
+      "14,1": 8,
+      "14,2": 8,
+      "14,3": 8,
+      "14,4": 8,
+      "14,5": 8,
+      "14,6": 8,
+      "14,7": 8,
+      "14,8": 8,
+      "14,9": 8,
+      "14,10": 8,
+      "14,11": 8,
+      "14,12": 8,
+      "14,13": 8,
+      "14,14": 8,
+      "16,1": 0,
+      "16,2": 1,
+      "16,3": 1,
+      "16,12": 0,
+      "16,13": 1,
+      "16,14": 1,
+      "18,0": 9,
+      "18,1": 10,
+      "18,2": 10,
+      "18,3": 11,
+      "18,4": 1
     },
     "SheetStyle": {
       "FontFamily": 0,
@@ -1031,17 +1180,19 @@
     }
   },
   "Spans": [
-    "17,1,1,3",
-    "17,12,1,3",
+    "16,1,1,3",
+    "16,12,1,3",
     "2,1,1,14",
-    "8,1,1,14",
-    "14,1,1,14",
-    "19,4,1,3",
+    "11,1,1,14",
+    "18,4,1,3",
+    "18,7,1,4",
+    "18,0,1,4",
+    "18,11,1,3",
+    "13,1,1,7",
     "5,1,1,14",
-    "19,7,1,4",
-    "19,0,1,4",
-    "19,11,1,3",
-    "11,1,1,14"
+    "8,9,1,6",
+    "7,13,1,2",
+    "8,1,1,6"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1087,7 +1238,7 @@
                   {
                     "Location": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目成员详情!16:18"
+                      "SerializeProperty": "=项目成员详情!15:17"
                     },
                     "Value": true
                   }
@@ -1099,7 +1250,7 @@
                   {
                     "TargetCells": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目成员详情!B9,项目成员详情!B15"
+                      "SerializeProperty": "=项目成员详情!B6,项目成员详情!B12"
                     },
                     "PropertyType": 0,
                     "Value": true
@@ -1107,7 +1258,7 @@
                 ]
               }
             ],
-            "ID": "cd21d959-0617-45ab-8096-64f8b3cc22a9"
+            "ID": "386ff9fb-b87a-45ea-b823-a0d900b93e21"
           },
           {
             "CommandList": [
@@ -1117,7 +1268,7 @@
                   {
                     "Location": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目成员详情!16:18"
+                      "SerializeProperty": "=项目成员详情!15:17"
                     },
                     "Value": false
                   }
@@ -1129,7 +1280,7 @@
                   {
                     "TargetCells": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目成员详情!B9,项目成员详情!B15"
+                      "SerializeProperty": "=项目成员详情!B6,项目成员详情!B12"
                     },
                     "PropertyType": 0,
                     "Value": false
@@ -1137,7 +1288,7 @@
                 ]
               }
             ],
-            "ID": "eab073ed-4301-4998-9255-1476dae2f018"
+            "ID": "a09ef5b4-da9c-43a8-8b4c-251716042d2c"
           }
         ]
       }
@@ -1186,15 +1337,15 @@
   "CustomNames": [
     {
       "Name": "项目ID",
-      "Formula": "项目成员详情!$A$20"
+      "Formula": "项目成员详情!$A$19"
     },
     {
       "Name": "已有项目成员",
-      "Formula": "项目成员详情!$H$20"
+      "Formula": "项目成员详情!$H$19"
     },
     {
       "Name": "ID",
-      "Formula": "项目成员详情!$E$20"
+      "Formula": "项目成员详情!$E$19"
     }
   ]
-}//Rw5oJXmKBEb02Ci8L7B0t+JQYEQyouMpQUL31G98lnFns8cIgRQL6dY7w5q3QMajHa+Agz3DIW9oiJjFJNGdC5jqmKa/RUSO/z5ytPMR6jbjybNbIQpYR6sFVn+M9B9q1vPKmKUD2BF/3QfDWe+Fyq1VE5aGoJe/5Esy7ffe8sAWkXLPtIbyAI9D2/neUPcZMVNBZYQCbJL/4Qm+rJOTg053XKLXlKkebW4vK2YT1QH2VM1fDQ8Fzl2zbm1TzhTQSo+6js9EZPsqWmZ3ErP4H1PD14NIvjh+7hZ/nJr0VnAJ/c6x4QqVOTEuHEoKLvamv9Wkj6/KgmLCjfuIAUz+VzpKAXBqXDOmDLQYYpPVhdfj8zdFUb2Buj+Eh3EieLdBmlwYu7GI5aIPz4iSnU9t6JWF+NkKISrqP76jH4IWleuioB0NMQAwIeSyUMdKs/7KRMz4DKsJzOtP6Tj89fgPGT4J3NJo/C479ua6Y5D1fU73OFyvJkw2Qx3kaXK59c7AS3v6VhxFW4YNk51jjKIGjbm9kyswAgrPC4Z6wg8CQ8/GuY/W2xTlYI+RSGWoe5TQ++qbxL3Sfi7x8IokwYTQQXKVzxzUwfSpmgu3Z9ysGy5tMsVJpb+BzUWYM7O7HnD8VCmRFjdQgz/JnClKzy7B+L+wYHob2+n+cO3FLk5VneTJ5h4pRkDDQlOMlPGm/ReWLbfCRAf0J8P9qnMXzhnAO47xXwoCKRGsc1QHHqsC0UZBp+c1j3i/TJNhCTPIvPZZhO/9wS3Xh4Zk55hktOOuIT5pPh4MbqmYMbVtpRYnJdO+yElAH7U0kDBrrUNE+zPSEA26sXnL95dErkcSyBmle6wx7Y+OoDWcN//kHoE68opbnqUmmcUUTyxO1mO7am1pMEbkUFBE8kCk8MCe6wSVrQ==|920
\ No newline at end of file
+}//dfHYz7b7PMa+0hwxMvSzZseOoA2e3crn9srbnAJpU+FjnOn0ZwJTTL2aViiJM/ofYCwQgNJEcC2Or7MUhdccPIkynQWEdI2MJuU07ZrN5UPqbo8SLRtbwDk4LE2Vj+BARuslcSpDHnkntRdDTNHvBMuFcj1xywOvSzqeLzPto7SYG2G0T5qfjVmFMGRdrZSuvEpgO0CpSjpu1IMPlD+PAbfB4d9p+WQP0NyfAuiQ9VIUMiEzQiR6MWge/ZuOjojH2R43CY+W04jAoKRPwI4eO3BlgGq50NCv6r+9brKo1JCobuA8ZFRZzts1hFxBnvITHCZs8MdWJgSwMGyNclghMElT4HHmRDmBisCTtcJVu/XZ7UB1qV02y21J8kHKK8MnLJKW8VnEIPbmPU81gjZnlL+9WlJFEzDsKoV7IqDI/D1ugO7ZQNl2EK+Z6PJs3eXGeo2Q2WY6/g3/LyR0EL6T+hEwMyRWzdQCjN5A+cL2iTSbfpoS/ZASdR8CEt8zee97OyvToIivZWZJADmPdtRd4LnuxLQDiRUkhuIo5ABbueIb1jDIWB58GGmAhkDoEl+4QTMuvj17Ev1jWbZ2rTA/haoc32NP5/CgfxeoRNs/vFLVPoj4eAQluQST3qnwgwnInAdJqCr5pDuGnW7RnWZy39OnrdvXinR/8IjswGm4hrqgvzi+RQMVkOdy+zkFqmr/WfLJs/XYxqZGv1pBeZv2LLnq2bfbbWFff04AoTqfNI6SzxAOoSABC+70Dvh0DOaowqRDdfUatwmRUEAynylpz3N36avzBhS2Ssv4OeDHTtvD6J+trWRLGzUXFO0lcLr6z4ak9a4jNYLvr/NinkECSsSNWPTfJQFIkSzumcY2h1pYZeX1+z7sbpBhGSQAzJQyaYFR7SljC/hZqnIQPD8q4w==|920
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.rd b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.rd
index 0104f469..7a7087fe 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.rd
+++ b/Pages/项目/项目首页/项目首页-容器页面/项目成员/项目成员详情.rd
@@ -1,22 +1,23 @@
 {
   "PageType": 0,
   "ColumnCount": 16,
-  "RowCount": 20,
+  "RowCount": 19,
   "Formulas": {
-    "5,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")"
+    "8,1": "IFERROR(ODATA(\"用户信息视图?$select=默认时薪&$filter=用户名 eq \"&IF(ISBLANK(B3),\"null\",\"'\"&B3&\"'\")&\"&$top=1\"),\"\")",
+    "13,1": "SWITCH(AND(B12=\"\",J9=\"\"),B9,B12=\"\",J9,J9=\"\",B9)"
   },
   "CustomNames": [
     {
       "Name": "项目ID",
-      "Formula": "项目成员详情!$A$20"
+      "Formula": "项目成员详情!$A$19"
     },
     {
       "Name": "已有项目成员",
-      "Formula": "项目成员详情!$H$20"
+      "Formula": "项目成员详情!$H$19"
     },
     {
       "Name": "ID",
-      "Formula": "项目成员详情!$E$20"
+      "Formula": "项目成员详情!$E$19"
     }
   ]
 }
\ No newline at end of file
diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin1.zip
similarity index 99%
rename from Plugin/DingTalkPlugin.zip
rename to Plugin/DingTalkPlugin1.zip
index 809fad8f..0ebf377f 100644
Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin1.zip differ
diff --git a/ServerCommands/AI/AI对话.json b/ServerCommands/AI/AI对话.json
index e3f0e7f7..aba647ab 100644
--- a/ServerCommands/AI/AI对话.json
+++ b/ServerCommands/AI/AI对话.json
@@ -119,7 +119,7 @@
               "ParamNameToSaveNewRowValue": "主题信息"
             }
           ],
-          "ID": "23a84d0a-4a11-44ae-b4ba-5078a5a6f266"
+          "ID": "ef3202de-36a9-478a-b32b-67ee6a7a3070"
         }
       ]
     },
@@ -242,8 +242,8 @@
                 "TopP": 1.0,
                 "MaxTokens": 1000,
                 "SystemContent": "你是一个乐于助人的智能助手，请您为我解答我提出的问题。",
-                "Response_format": "text",
-                "Stream": true
+                "Stream": true,
+                "Response_format": "text"
               },
               "Tools": [],
               "ResultTo": "result",
@@ -343,7 +343,7 @@
                       ]
                     }
                   ],
-                  "ID": "783a0517-f995-4d73-82be-c7c6936eba22"
+                  "ID": "d63acde2-a40a-42bd-a88c-44135333aec3"
                 }
               ]
             },
@@ -353,7 +353,7 @@
               "Message": "回答完毕"
             }
           ],
-          "ID": "341980fc-96ae-4bfb-b828-d5dec4c113da"
+          "ID": "c820392c-8911-4432-841b-3468d08ade5a"
         },
         {
           "CommandList": [
@@ -363,7 +363,7 @@
               "Message": "请输入消息"
             }
           ],
-          "ID": "75a883a7-a2ad-470a-a644-0df702c8bc17"
+          "ID": "1b6161c1-eed5-4f8e-88af-a7a0bf20d52c"
         }
       ]
     }
diff --git a/ServerCommands/钉钉/订阅钉钉回调事件.json b/ServerCommands/钉钉/订阅钉钉回调事件.json
index f309871d..5fa6ae6c 100644
--- a/ServerCommands/钉钉/订阅钉钉回调事件.json
+++ b/ServerCommands/钉钉/订阅钉钉回调事件.json
@@ -13,98 +13,324 @@
         "CommandList": [
           {
             "$type": "DingTalkPlugin.DingtalkStream, DingTalkPlugin",
-            "CommandList": [
-              {
-                "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
-                "TryCommandPart": {
-                  "CommandList": [
-                    {
-                      "$type": "GETPOST.JSON类.JSON序列化, GETPOST",
-                      "BianmaMsg": {
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=result"
+            "CommandList": {
+              "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands",
+              "Commands": [
+                {
+                  "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon",
+                  "TryCommandPart": {
+                    "CommandList": [
+                      {
+                        "$type": "JsonUtilityCommand.JsonSerializeCommand, JsonUtilityCommand",
+                        "SourceObject": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=事件体"
+                        },
+                        "ToParameter": "jsonstring",
+                        "Disabled": true
                       },
-                      "FanHuiMsg": "json_result"
-                    },
-                    {
-                      "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                      "TableName": "日志表",
-                      "UpdateType": "add",
-                      "ShowConfirm": false,
-                      "UpdateBindingValues": [
-                        {
-                          "BindingInfo": {
-                            "TableName": "日志表",
-                            "ColumnName": "标题",
-                            "GUID": "9c35ba08-54d6-4d3b-ac42-a7f1e5ca4497"
+                      {
+                        "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                        "TableName": "日志表",
+                        "UpdateType": "add",
+                        "ShowConfirm": false,
+                        "UpdateBindingValues": [
+                          {
+                            "BindingInfo": {
+                              "TableName": "日志表",
+                              "ColumnName": "标题",
+                              "GUID": "b6be6f1d-2125-45b1-90d8-81a2a3bc4f9c"
+                            },
+                            "Value": "钉钉回调事件"
                           },
-                          "Value": "钉钉回调事件"
-                        },
-                        {
-                          "BindingInfo": {
-                            "TableName": "日志表",
-                            "ColumnName": "内容",
-                            "GUID": "cc6f1e2b-134f-41f9-94e0-94929e1a38e8"
+                          {
+                            "BindingInfo": {
+                              "TableName": "日志表",
+                              "ColumnName": "内容",
+                              "GUID": "1c9b0efb-e26d-4ccf-8100-a926c9a1cb08"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=事件体"
+                            }
                           },
-                          "Value": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=json_result"
+                          {
+                            "BindingInfo": {
+                              "TableName": "日志表",
+                              "ColumnName": "类型",
+                              "GUID": "39d7c9da-07d9-4b66-bf39-4928ef7bdad9"
+                            },
+                            "Value": "Info"
                           }
-                        },
-                        {
-                          "BindingInfo": {
-                            "TableName": "日志表",
-                            "ColumnName": "类型",
-                            "GUID": "6474bf86-79e7-4f6a-9588-f7fffa665451"
-                          },
-                          "Value": "Info"
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "CatchCommandPart": {
-                  "CommandList": [
-                    {
-                      "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
-                      "TableName": "日志表",
-                      "UpdateType": "add",
-                      "ShowConfirm": false,
-                      "UpdateBindingValues": [
-                        {
-                          "BindingInfo": {
-                            "TableName": "日志表",
-                            "ColumnName": "标题",
-                            "GUID": "4b257287-6c90-4f8b-99cf-d6b37fd02eb9"
-                          },
-                          "Value": "订阅钉钉回调子命令"
-                        },
-                        {
-                          "BindingInfo": {
-                            "TableName": "日志表",
-                            "ColumnName": "内容",
-                            "GUID": "335f0b1e-6505-46c5-a651-703229369a66"
-                          },
-                          "Value": {
-                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                            "SerializeProperty": "=ExceptionMessage"
+                        ]
+                      },
+                      {
+                        "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                        "ConditionAndCommandPairList": [
+                          {
+                            "Condition": {
+                              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                              "param": {
+                                "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                                "ParamObject": {
+                                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                  "SerializeProperty": "=事件类型"
+                                }
+                              },
+                              "value": "meeting_status_change"
+                            },
+                            "CommandList": [
+                              {
+                                "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                                "ConditionAndCommandPairList": [
+                                  {
+                                    "Condition": {
+                                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                      "param": {
+                                        "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                                        "ParamObject": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=事件体.changeScene"
+                                        }
+                                      },
+                                      "value": "conference_created"
+                                    },
+                                    "CommandList": [
+                                      {
+                                        "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                                        "ParameterName": "会议开始时间",
+                                        "ParameterValue": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=(事件体.openConfModel.startTime/1000/60/60/24)+DATE(1970,1,1)"
+                                        },
+                                        "ID": "67a6eacbe87440258255fdae83fc3844"
+                                      },
+                                      {
+                                        "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                                        "TableName": "会议记录表",
+                                        "ShowConfirm": false,
+                                        "RowsToUpdate": 1,
+                                        "RowsToUpdateCondition": {
+                                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                          "ColumnBindingInfo": {
+                                            "TableName": "会议记录表",
+                                            "ColumnName": "钉钉会议ID",
+                                            "GUID": "8bad996d-33a8-4d83-9871-eb5fc4bc5d0d"
+                                          },
+                                          "Value": {
+                                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                            "SerializeProperty": "=事件体.openConfModel.conferenceId"
+                                          }
+                                        },
+                                        "UpdateBindingValues": [
+                                          {
+                                            "BindingInfo": {
+                                              "TableName": "会议记录表",
+                                              "ColumnName": "会议业务类型",
+                                              "GUID": "cb2afa4c-d30d-44dc-acc7-8c6abcf7f755"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=事件体.openConfModel.bizType"
+                                            }
+                                          },
+                                          {
+                                            "BindingInfo": {
+                                              "TableName": "会议记录表",
+                                              "ColumnName": "会议开始时间",
+                                              "GUID": "93cd84fe-01a3-489d-a8a5-ee031662c735"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=会议开始时间"
+                                            }
+                                          },
+                                          {
+                                            "BindingInfo": {
+                                              "TableName": "会议记录表",
+                                              "ColumnName": "会议持续时间",
+                                              "GUID": "2b73f3ad-1641-4205-98ce-e94a6cbd2df9"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=事件体.openConfModel.confDuration"
+                                            }
+                                          },
+                                          {
+                                            "BindingInfo": {
+                                              "TableName": "会议记录表",
+                                              "ColumnName": "会议状态",
+                                              "GUID": "650e211a-47d5-4b6f-90c0-f6873fc4a2f2"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=事件体.openConfModel.status"
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    ],
+                                    "Comments": "会议创建事件",
+                                    "ID": "f981a0a3-2650-4d2c-bb20-3beceb2d9e6c"
+                                  },
+                                  {
+                                    "Condition": {
+                                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                      "param": {
+                                        "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                                        "ParamObject": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=事件体.changeScene"
+                                        }
+                                      },
+                                      "value": "conference_closed"
+                                    },
+                                    "CommandList": [
+                                      {
+                                        "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                                        "ParameterName": "会议结束时间",
+                                        "ParameterValue": {
+                                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                          "SerializeProperty": "=(事件体.openConfModel.startTime/1000/60/60/24)+DATE(1970,1,1)"
+                                        },
+                                        "ID": "722da488cdd348e9abe70615143cee68"
+                                      },
+                                      {
+                                        "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                                        "TableName": "会议记录表",
+                                        "ShowConfirm": false,
+                                        "RowsToUpdate": 1,
+                                        "RowsToUpdateCondition": {
+                                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                          "ColumnBindingInfo": {
+                                            "TableName": "会议记录表",
+                                            "ColumnName": "钉钉会议ID",
+                                            "GUID": "8bad996d-33a8-4d83-9871-eb5fc4bc5d0d"
+                                          },
+                                          "Value": {
+                                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                            "SerializeProperty": "=事件体.openConfModel.conferenceId"
+                                          }
+                                        },
+                                        "UpdateBindingValues": [
+                                          {
+                                            "BindingInfo": {
+                                              "TableName": "会议记录表",
+                                              "ColumnName": "会议结束时间",
+                                              "GUID": "51660e50-7bfc-4e48-ad1b-904b32075cc4"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=会议结束时间"
+                                            }
+                                          },
+                                          {
+                                            "BindingInfo": {
+                                              "TableName": "会议记录表",
+                                              "ColumnName": "会议持续时间",
+                                              "GUID": "f37e42e7-b744-414b-851f-78e95df8e518"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=事件体.openConfModel.confDuration"
+                                            }
+                                          },
+                                          {
+                                            "BindingInfo": {
+                                              "TableName": "会议记录表",
+                                              "ColumnName": "会议状态",
+                                              "GUID": "54c167de-8b3f-49b4-9f09-a1af7c5af723"
+                                            },
+                                            "Value": {
+                                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                              "SerializeProperty": "=事件体.openConfModel.status"
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    ],
+                                    "ID": "4a3dbf32-ff5b-41ff-9c9b-a62e6b7050d0"
+                                  }
+                                ]
+                              }
+                            ],
+                            "Comments": "会议状态变更",
+                            "ID": "a4967d4b-4c3f-4069-93d6-38d6562a74d1"
                           }
-                        },
-                        {
-                          "BindingInfo": {
-                            "TableName": "日志表",
-                            "ColumnName": "类型",
-                            "GUID": "44a2d69d-82af-41fd-8881-b578b2c600a3"
+                        ],
+                        "Disabled": true
+                      },
+                      {
+                        "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                        "ErrorCode": "0",
+                        "Message": "回调事件数据已被处理"
+                      }
+                    ]
+                  },
+                  "CatchCommandPart": {
+                    "CommandList": [
+                      {
+                        "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                        "TableName": "日志表",
+                        "UpdateType": "add",
+                        "ShowConfirm": false,
+                        "UpdateBindingValues": [
+                          {
+                            "BindingInfo": {
+                              "TableName": "日志表",
+                              "ColumnName": "标题",
+                              "GUID": "e8a772da-4305-4dbc-bc32-429867fddbfd"
+                            },
+                            "Value": "钉钉回调处理异常"
                           },
-                          "Value": "Error"
+                          {
+                            "BindingInfo": {
+                              "TableName": "日志表",
+                              "ColumnName": "内容",
+                              "GUID": "76aff35f-15ae-4591-9756-53460b7325cd"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=ExceptionCode"
+                            }
+                          },
+                          {
+                            "BindingInfo": {
+                              "TableName": "日志表",
+                              "ColumnName": "类型",
+                              "GUID": "729f0ffa-bd9c-4252-ac88-239ecc5b864f"
+                            },
+                            "Value": {
+                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                              "SerializeProperty": "=ExceptionMessage"
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                        "ErrorCode": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=ExceptionCode"
+                        },
+                        "Message": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=ExceptionMessage"
                         }
-                      ]
-                    }
-                  ]
+                      }
+                    ]
+                  }
                 }
+              ],
+              "ParamProperties": {
+                "eventUnifiedAppId": "统一应用身份Id",
+                "eventCorpId": "事件所属的corpId",
+                "eventType": "事件类型",
+                "eventId": "事件的唯一Id",
+                "eventBornTime": "事件生成时间",
+                "data": "事件体"
               }
-            ],
-            "ResultTo": "result"
+            }
           }
         ]
       },
@@ -120,7 +346,7 @@
                 "BindingInfo": {
                   "TableName": "日志表",
                   "ColumnName": "标题",
-                  "GUID": "e7e0a386-6011-4cec-80e4-99fb58e62835"
+                  "GUID": "e6b11501-8180-4ed2-a935-b44a2108ebbc"
                 },
                 "Value": "订阅钉钉回调事件注册"
               },
@@ -128,7 +354,7 @@
                 "BindingInfo": {
                   "TableName": "日志表",
                   "ColumnName": "内容",
-                  "GUID": "bce32959-8f8a-4a42-96b4-8a858cc50616"
+                  "GUID": "816e9dbd-58bb-4aff-858a-9ff9968a4b0b"
                 },
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -139,7 +365,7 @@
                 "BindingInfo": {
                   "TableName": "日志表",
                   "ColumnName": "类型",
-                  "GUID": "6b009867-868c-49a5-a1f9-703e9286b9d3"
+                  "GUID": "7f1b826e-2cf0-45aa-b88d-5519244f8d37"
                 },
                 "Value": "Error"
               }