diff --git a/.collaboration b/.collaboration
index a0a3ada2..e513a878 100644
--- a/.collaboration
+++ b/.collaboration
@@ -750,17 +750,7 @@
   },
   {
     "ModuleName": "PCPage/新增报工",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-13T22:49:34.8851444+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\工时\\新增报工.json",
-      "Pages\\任务\\工时\\新增报工.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/分配计划工时",
@@ -1576,44 +1566,7 @@
   },
   {
     "ModuleName": "Plugin",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-13T23:27:02.6695579+08:00",
-    "ModuleType": 40,
-    "ToRemoveFiles": [
-      "Plugin\\Echarts图表-10_0_3_0.zip",
-      "Plugin\\Editormd-6_0_102_0.zip",
-      "Plugin\\Forguncy.CustomMenu.zip",
-      "Plugin\\Forguncy.PassListviewDataCommand.zip",
-      "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip",
-      "Plugin\\JSON数据源-10_0_2_0.zip",
-      "Plugin\\LottiePlayer.zip",
-      "Plugin\\Notiflix-9_0_103_0.zip",
-      "Plugin\\OPENAIFORGUNCY.zip",
-      "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip",
-      "Plugin\\SqlServerWrapper.zip",
-      "Plugin\\Tiny富文本编辑器-10_0_2_0.zip",
-      "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip",
-      "Plugin\\加载动画-10_0_2_0.zip",
-      "Plugin\\发送HTTP请求命令-10_0_2_0.zip",
-      "Plugin\\增强关闭页面-9_0_6.zip",
-      "Plugin\\复制到剪贴板-7_0_3_0.zip",
-      "Plugin\\客户端缓存操作工具库-8_0_0_0.zip",
-      "Plugin\\富文本编辑器-10_0_2_0.zip",
-      "Plugin\\对象与集合操作工具-8_0_0_0.zip",
-      "Plugin\\异步运行命令-9_0_103_0.zip",
-      "Plugin\\支持预览的附件上传-10_0_2_0.zip",
-      "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
-      "Plugin\\模板引擎操作库-9_0_103_0.zip",
-      "Plugin\\甘特图-10_0_2_0.zip",
-      "Plugin\\用户管理命令 V2-10_0_2_0.zip",
-      "Plugin\\网络操作库-9_0_102_0.zip",
-      "Plugin\\设置当前行命令-10_0_2_0.zip",
-      "Plugin\\设置焦点命令-10_0_2_0.zip"
-    ]
+    "ModuleType": 40
   },
   {
     "ModuleName": "PublishSetting",
@@ -1665,16 +1618,7 @@
   },
   {
     "ModuleName": "ServerCommand/根据汇报模板生成内容",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-13T23:25:41.1273843+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\根据汇报模板生成内容.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "PCPage/日报详情",
@@ -1718,16 +1662,7 @@
   },
   {
     "ModuleName": "ServerCommand/GitCallback",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-13T22:50:20.7528159+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\Gitee\\GitCallback.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "Table/日志表",
@@ -1735,16 +1670,7 @@
   },
   {
     "ModuleName": "Table/Git_事件记录",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-13T22:58:09.6625258+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\Git\\Git_事件记录.json"
-    ]
+    "ModuleType": 7
   },
   {
     "ModuleName": "PCPage/选择Git仓库",
@@ -1804,22 +1730,10 @@
   },
   {
     "ModuleName": "ServerCommand/从Gitee提取报工",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-13T22:56:10.7040341+08:00",
     "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommand/服务端命令1",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-13T23:24:28.2342221+08:00",
     "ModuleType": 15
   }
 ]
\ No newline at end of file
diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json
index a626f324..1c4302f1 100644
--- a/Pages/任务/工时/新增报工.json
+++ b/Pages/任务/工时/新增报工.json
@@ -11,6 +11,11 @@
           "DesignLengthInPixel": 32.0
         }
       },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
       "5": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 10.0
@@ -26,6 +31,11 @@
           "DesignLengthInPixel": 24.0
         }
       },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
       "9": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 10.0
@@ -36,6 +46,16 @@
           "DesignLengthInPixel": 35.0
         }
       },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
       "13": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 10.0
@@ -46,6 +66,18 @@
           "DesignLengthInPixel": 35.0
         }
       },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0,
+          "IsHidden": true
+        }
+      },
+      "16": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0,
+          "IsHidden": true
+        }
+      },
       "17": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 10.0,
@@ -58,6 +90,16 @@
           "IsHidden": true
         }
       },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 27.0
+        }
+      },
       "21": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 10.0
@@ -110,46 +152,6 @@
           "DesignLengthInPixel": 27.0,
           "IsHidden": true
         }
-      },
-      "4": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "8": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "11": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "12": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "15": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "16": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "19": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
-      },
-      "20": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
-        }
       }
     },
     "InLogicalVisibleIndexes": [
@@ -257,6 +259,7 @@
     "12,1": "工时数",
     "16,1": "特定时薪",
     "20,1": "工作进展",
+    "20,11": "从Gitee分析",
     "27,1": "取消",
     "27,12": "提交"
   },
@@ -580,6 +583,64 @@
         "InputMessage": "留空则系统按照项目设置自动计算，除非你针对此次报工有特殊调整"
       }
     },
+    "20,11": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+            "TargetPageElement": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=新增报工!B11"
+            },
+            "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560",
+            "MethodName": "GetSelectedRange",
+            "RetrunParamNames": {
+              "StartValue": {
+                "SerializeProperty": "开始日期"
+              },
+              "EndValue": {
+                "SerializeProperty": "结束日期"
+              }
+            }
+          },
+          {
+            "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+            "ServerCommandName": "从Gitee提取报工",
+            "Parameters": [
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "开始日期"
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "结束日期"
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "用户"
+              }
+            ],
+            "ReturnPropertiesTo": [
+              {
+                "ResultPropertyName": "工时"
+              },
+              {
+                "ResultPropertyName": "工作内容"
+              }
+            ],
+            "RefreshAfterFinish": true,
+            "CheckDataValidation": true
+          }
+        ],
+        "Text": "从Gitee分析",
+        "TemplateKey": "_RS_Information3",
+        "Icon": {
+          "Name": "gitee.svg"
+        },
+        "IconSize": 14.0
+      }
+    },
     "22,1": {
       "CellType": {
         "$type": "ElementUI.InputCellType, ElementUI",
@@ -875,7 +936,7 @@
                                                           "ReloadData": true
                                                         }
                                                       ],
-                                                      "ID": "afade9a5-7bfc-43ed-8981-754bcf848897"
+                                                      "ID": "0d5b7cca-313c-4117-8274-c5a2ab3d7174"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -890,12 +951,12 @@
                                                           "BtnText": "知道了"
                                                         }
                                                       ],
-                                                      "ID": "90131f66-35da-47ae-b08e-eca98e360d9c"
+                                                      "ID": "4a0110c2-73b8-4923-b1f3-90760e18ca96"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "45bc7570-d288-4845-8bf5-1ee59262316c"
+                                              "ID": "e769ce38-75d1-44fc-9ad7-aa30965e8489"
                                             },
                                             {
                                               "CommandList": [
@@ -905,7 +966,7 @@
                                                   "Message": "用户已取消"
                                                 }
                                               ],
-                                              "ID": "a8b7ba12-52a5-4f73-b118-e67bb78daf8d"
+                                              "ID": "aafecc35-9659-436d-84f6-734ed88f988f"
                                             }
                                           ]
                                         }
@@ -948,12 +1009,12 @@
                                     "LoadBindingDataOption": 2
                                   }
                                 ],
-                                "ID": "09fba22f-d514-4b43-bdef-3af9e22a337d"
+                                "ID": "add07b79-e909-48c8-a3ad-4f142e677b76"
                               }
                             ]
                           }
                         ],
-                        "ID": "aa2aeed7-cb0b-466d-b878-80f8287b15fd"
+                        "ID": "65867378-0d44-406b-811c-7b93e2429105"
                       },
                       {
                         "CommandList": [
@@ -1066,7 +1127,7 @@
                                     "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
                                   }
                                 ],
-                                "ID": "e0019d8a-7d3b-4657-b1a0-5de07d5cac5c"
+                                "ID": "7c27e6f7-2c4e-4433-a52f-006af941a982"
                               }
                             ]
                           },
@@ -1318,7 +1379,7 @@
                                                           "ReloadData": true
                                                         }
                                                       ],
-                                                      "ID": "2e0fbc53-5aa1-40f4-83d7-a38f022c29da"
+                                                      "ID": "2195e0ed-29a4-4ec9-8a91-e43051ca6ab8"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -1333,12 +1394,12 @@
                                                           "BtnText": "知道了"
                                                         }
                                                       ],
-                                                      "ID": "033ac1fc-377d-488e-b701-73888cee3fda"
+                                                      "ID": "9f0d5372-0467-463c-97ec-0a477f7b5c16"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "9197175d-ed47-4dc1-8a36-751a2f0df55c"
+                                              "ID": "fe6d0b94-16f7-45e7-b91e-cb11206ea466"
                                             }
                                           ]
                                         }
@@ -1415,7 +1476,7 @@
                                     ]
                                   }
                                 ],
-                                "ID": "bd1aa0eb-f94b-4c40-9174-127dca5d662c"
+                                "ID": "877dff23-360e-4fb1-b16b-7d8bc625816b"
                               },
                               {
                                 "CommandList": [
@@ -1430,17 +1491,17 @@
                                     "BtnText": "知道了"
                                   }
                                 ],
-                                "ID": "55b4ef56-4bf6-403e-90d4-bec99b6ed947"
+                                "ID": "61999c3c-9931-48c8-8d05-85502c979454"
                               }
                             ]
                           }
                         ],
-                        "ID": "07b165b1-d281-4d07-8f26-e47217df378a"
+                        "ID": "1299bb0c-9e0e-4650-bc8c-24bce966514f"
                       }
                     ]
                   }
                 ],
-                "ID": "6bdb068f-1897-4fe7-8e15-803fedf68583"
+                "ID": "6d2420a2-b21c-4a77-bd06-02d80bf47fda"
               },
               {
                 "CommandList": [
@@ -1450,7 +1511,7 @@
                     "Message": "请添加参与人后进行操作"
                   }
                 ],
-                "ID": "a1051b7a-731c-4938-b3cf-a6f4112f7084"
+                "ID": "d9fbe203-7056-4e52-b3c9-34a8f112139f"
               }
             ]
           }
@@ -1496,14 +1557,14 @@
         "Foreground": 4,
         "HorizontalAlignment": 5
       },
-      {
-        "BorderBottom": 0
-      },
       {
         "FontFamily": 2,
         "FontSize": 13.333333333333332,
         "Formatter": 1
       },
+      {
+        "BorderBottom": 0
+      },
       {
         "Background": 7,
         "FontFamily": 2,
@@ -1679,10 +1740,7 @@
       "20,8": 1,
       "20,9": 1,
       "20,10": 1,
-      "20,11": 1,
-      "20,12": 1,
-      "20,13": 1,
-      "20,14": 1,
+      "20,11": 6,
       "20,15": 1,
       "21,0": 1,
       "21,1": 1,
@@ -1717,21 +1775,21 @@
       "24,12": 1,
       "24,13": 1,
       "24,14": 1,
-      "25,1": 6,
-      "25,2": 6,
-      "25,3": 6,
-      "25,4": 6,
-      "25,5": 6,
-      "25,6": 6,
-      "25,7": 6,
-      "25,8": 6,
-      "25,9": 6,
-      "25,10": 6,
-      "25,11": 6,
-      "25,12": 6,
-      "25,13": 6,
-      "25,14": 6,
-      "27,1": 7,
+      "25,1": 7,
+      "25,2": 7,
+      "25,3": 7,
+      "25,4": 7,
+      "25,5": 7,
+      "25,6": 7,
+      "25,7": 7,
+      "25,8": 7,
+      "25,9": 7,
+      "25,10": 7,
+      "25,11": 7,
+      "25,12": 7,
+      "25,13": 7,
+      "25,14": 7,
+      "27,1": 6,
       "27,2": 1,
       "27,3": 1,
       "29,6": 8,
@@ -1756,7 +1814,8 @@
     "29,6,1,4",
     "2,1,1,14",
     "29,1,1,4",
-    "6,1,1,14"
+    "6,1,1,14",
+    "20,11,1,4"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1791,7 +1850,7 @@
                 ]
               }
             ],
-            "ID": "6ba9e08f-f42a-4313-a868-aa99eb1eef0e"
+            "ID": "fc47b647-ae9f-4e85-b2e7-29668c1ad1a1"
           },
           {
             "CommandList": [
@@ -1808,7 +1867,7 @@
                 ]
               }
             ],
-            "ID": "8eb6f295-19d2-456e-86f6-68c24c7247b6"
+            "ID": "a0c20aba-9e2a-4324-b33b-b88ee6285496"
           }
         ]
       }
@@ -1845,4 +1904,4 @@
       "Formula": "新增报工!$B$30"
     }
   ]
-}//TPM8aO2iqlitB6twTPumNxdJ494J6Q2CbDdHRaITHCGEMqVOqVcRu+PVPaSj+1zcI/wV0UIqo891Wo+djl9ED7uvzUl/Gm+n6u1miVPTojQSUKvUd7uotIE7nmIgcEo5WuVPrH92F3snHSL6ukQFGYeyLoNQLxGvkb5SGCLKSLLkTjLWLfoyUxJrbgSYoTn6exyj2exkRi/ckYxarhnAgDIEbWxwmdfq44MOsTy81M5g8eSTVexXOkrM2ZycGjWo8Cynte+VCZ0Xe7llNcKepBgmiz6Waxa7OHAjesSSaV+HA4uQi0Yrtnp9bPeBmnNC5lGekeQ8qOT4sWZyTGUnxxNEZ0tStasK7uV8iOh6x62IKXTI8KXlvKG04uzZaI99wLkOkeH1rxBw6Ho5ZMuXyTOXPrIrqX0VX4dtpuXx7pFzSe4tbY82s2GFbk+SrTTCsPpglQ5dq803R7QWA14b2ydfBQ2KpJS5LR5atFDCmys6bQYmvCUqLQ5f6Pqs0DPBWWNOi+Nuutqj+ipTiXWcohETXTDmo7Fz074cCR2H3Wyc7BfEvW7sReduep1b1NaoV0XANMYd91NoVbyYVQp6sSII+yQ2MSYkHSvZO4uKj/O91KNz0wiMWSoRkTnvZvTpgMqPeBczzwd5qRj7hXNPcUDY/lsE4Dpx12nLtoa1GOLkMs6qcKIXjbf6qBJWul0hrSp68Qopg9tf00nkr9AoldQglPlSeF70BfJzVz2KKsvyeLWJrFeY0OBsYqwDqGXR8s3tVUQVb1UAruyfzXpwEZJVHlU+QjyKAGYTkgQCA7OwF2/336K02+XY8klKb7qK6ej3oRsC1PbPp9AGwQ8qvjRfLKMRvXHeuv3N7VmlMalHAWmgKgqsvfB6z+VZXT3g/oT7e8N+7H3xWe6A7c8CAA==|920
\ No newline at end of file
+}//oKG/t6cMJPsVNK941P+T0C+9dKayej9cnJa2YPfbwNYYD3lIMSXfNbbgf7hODepiZpG7/knIhZQYuJHJ2miD+zDMveGIP6LaGFXuIOytJmJg+3l015zYtemqMpciAARIxNQbK5YIox6JTnIvjgf/270I+NcMpgOu0j4cbmO1dJbPfBfivTFIAcWriZveDH2Vdiy2/TbQdiv3TzaNN/HDXVZXoWd6J/TpeDNLv7DCmVt1W60NdIFG16+gpmhpSlWIFmWJvsGMui6WuVmNlmGTeJg9Bg7a4su6/1igfhv8rvEpFjDLPewQsjHwX+KS6Dt+0lsDAMkLtoSI6t7DuhzlpU/2tAdwjQNepd0FlmzwjH/MdDnrKbXyLUj8CviQ/xGb2alSRePH1/8NJIt+o05+ZoWh+FTMpefVt58p6xS9eTqdyZuAI1CmJHBS+ITNIRid2o05/tIjQ6J00FuETcnRhzeLmv/VqpSUcRWE4V8ELLV62uNLxDoYpxx3vTvB1vKIOinq+SUwdK/NsMlrsZv4EIAZ7u8Zrwa2iYyEGtNzbqQMAWif9BpNCcQ7MVGV7O9ewHINo2VSxA4y26CWOnvtD+Nu9klpgXe7/TIOTEDVHj33WayJLMscDRI4M2Ky2fH7mNr/H9vkG1lrIbuKrUtau4LOXt6PKaYQ+U9fGRl5UAntgeoldmfytizS5CSkgyOff0Q6ebvCVYXjpG+3axVG4a263QCsgaJoEFAg2XxAGAs/CgJ3cY4Ms6oLqCt8l46uzO18C7DtNZ3LuMG64LCikwHOxY4wt6iP/NvAdnOm0CvrOhpoYo5LKxCR5zWo7UrvJjl090Q8bZzyEV4PzmHYxppiu9hFh6HbLuHxRiDGlgeOaoSB7BHWPD4rNEgzQwUkpiNny96WfX2fK6sefsbtrg==|920
\ No newline at end of file
diff --git a/Plugin/模板引擎操作库-9_0_103_0.zip b/Plugin/模板引擎操作库-9_0_103_0.zip
deleted file mode 100644
index fe1a19de..00000000
Binary files a/Plugin/模板引擎操作库-9_0_103_0.zip and /dev/null differ
diff --git a/ServerCommands/Gitee/GitCallback.json b/ServerCommands/Gitee/GitCallback.json
index cd7bb8f0..d75b302a 100644
--- a/ServerCommands/Gitee/GitCallback.json
+++ b/ServerCommands/Gitee/GitCallback.json
@@ -87,7 +87,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "事件名称",
-                            "GUID": "4a8c6ac8-b856-4278-b392-71f5e9c5dddf"
+                            "GUID": "b5698686-4edb-4a65-a2e5-45ed333fadc5"
                           },
                           "Value": "签入工程"
                         },
@@ -95,7 +95,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "hook_id",
-                            "GUID": "3c638757-db39-4dc0-9caf-23742f16248c"
+                            "GUID": "fd4a5dbb-e0ad-4bf7-9322-d9adf645eb32"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -106,7 +106,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "事件内容",
-                            "GUID": "b598c086-1359-4986-8fe2-948b3125b6e0"
+                            "GUID": "df11c98f-3267-4f64-94db-e7770898100e"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -117,7 +117,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "空间路径",
-                            "GUID": "31dbfe89-d3ea-4d35-beeb-20f162ac2f32"
+                            "GUID": "65e021d0-421e-4513-b77d-627a293cca44"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -128,7 +128,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "仓库名称",
-                            "GUID": "d300a046-e686-4bac-8518-8e4c91c26af3"
+                            "GUID": "6e0426ba-e02d-4d5b-978f-02aaa78e2f1d"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -139,7 +139,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "仓库路径",
-                            "GUID": "274d0047-93b5-4cc7-911c-ea9d00dead97"
+                            "GUID": "9a4a577a-89ff-45fe-9403-b76a61ca264e"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -150,7 +150,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "url",
-                            "GUID": "a5762f11-535c-4ebf-942c-ab0c64af3b6e"
+                            "GUID": "132e4684-4a02-4380-8595-93f2780e327a"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -161,7 +161,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "提交人",
-                            "GUID": "4cb05733-1db1-4011-af03-503607c193b5"
+                            "GUID": "0f80fa89-fa73-4a11-abfb-700ebd4bee12"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -172,7 +172,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "git用户名",
-                            "GUID": "c16cdba8-0977-47ac-ab2b-96cd1e8ba5c8"
+                            "GUID": "4b26a8fd-1245-4a97-acdd-f474f45f7cfd"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -183,7 +183,7 @@
                           "BindingInfo": {
                             "TableName": "Git_事件记录",
                             "ColumnName": "仓库ID",
-                            "GUID": "1b147d14-33e9-4e3b-abab-1ccaab785b3c"
+                            "GUID": "61b0a85a-db65-4576-9e9f-29c51865599e"
                           },
                           "Value": {
                             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -198,22 +198,208 @@
                       "Message": "签入已被记录"
                     }
                   ],
-                  "ID": "3ae160a6-4b21-4966-9322-d2c9fef5dae2"
+                  "ID": "61cdb37b-e3df-4ec8-b55d-6cc16166bcbd"
                 },
                 {
                   "CommandList": [
+                    {
+                      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                      "ParameterName": "今日记录",
+                      "TableValue": {
+                        "TableName": "Git_事件记录",
+                        "TableValueType": 3,
+                        "SqlCondition": {
+                          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                          "SubConditions": [
+                            {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "仓库ID",
+                                "GUID": "715f1edb-652c-46e3-b189-4c8bd44cf1d1"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=钩子数据.repository.id"
+                              }
+                            },
+                            {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "git用户名",
+                                "GUID": "4410e001-f94f-43ee-8ae0-b8a789a71786"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=钩子数据.head_commit.committer.username"
+                              }
+                            },
+                            {
+                              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                              "ColumnBindingInfo": {
+                                "TableName": "Git_事件记录",
+                                "ColumnName": "FGC_CreateDate",
+                                "GUID": "1f8b096d-adc6-4715-ab1e-2919781aca6b"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=TODAY()"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "ID": "870440a4356a42c68a1979afdc94a1d5"
+                    },
+                    {
+                      "$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": "0"
+                          },
+                          "CommandList": [
+                            {
+                              "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                              "TableName": "Git_事件记录",
+                              "UpdateType": "add",
+                              "ShowConfirm": false,
+                              "UpdateBindingValues": [
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "事件名称",
+                                    "GUID": "987654e9-a86d-4983-98c3-1d5c2b94733f"
+                                  },
+                                  "Value": "签出模块"
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "hook_id",
+                                    "GUID": "bca8da11-66d8-4365-b254-881fd7e5dcd7"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.hook_id"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "事件内容",
+                                    "GUID": "7eef9be6-a388-4e96-9b01-758d8efd041e"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=SUBSTITUTE(message.Message,\"签出模块 : \",\"\")"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "空间路径",
+                                    "GUID": "69513fe0-9c5a-402a-9315-2e25e0d97ed1"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.repository.namespace"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "仓库名称",
+                                    "GUID": "039c74bf-f727-4425-b446-8c39180ff5a3"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.repository.name"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "仓库路径",
+                                    "GUID": "6b130a65-144f-449d-a106-59551eb02836"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.repository.path"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "url",
+                                    "GUID": "b0b69598-37b2-42a0-b2a9-ae2a841bbf35"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.head_commit.url"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "提交人",
+                                    "GUID": "103181f1-6b88-4a0f-acf5-3abe972d80b0"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.head_commit.committer.name"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "git用户名",
+                                    "GUID": "e5bfa05a-f1f9-4aa7-be57-adc7318bf57e"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.head_commit.committer.username"
+                                  }
+                                },
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "Git_事件记录",
+                                    "ColumnName": "仓库ID",
+                                    "GUID": "2da4c9d9-7976-4cb5-b058-85b95eea804c"
+                                  },
+                                  "Value": {
+                                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                    "SerializeProperty": "=钩子数据.repository.id"
+                                  }
+                                }
+                              ]
+                            }
+                          ],
+                          "ID": "b183a29c-3c17-4c4c-9de2-2b5ab4a32f01"
+                        }
+                      ]
+                    },
                     {
                       "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
                       "ErrorCode": "0",
                       "Message": "忽略非签入事件"
                     }
                   ],
-                  "ID": "0852ed40-e5c5-4daa-9850-9839fef14cd9"
+                  "ID": "a372f8cc-845f-42c5-870b-66e27f536a22"
                 }
               ]
             }
           ],
-          "ID": "1244ca0a-1ac7-4a41-8b3d-0406b5e04fd9"
+          "ID": "0e35e22f-578c-4d58-baee-93e4256386f5"
         }
       ]
     }
diff --git a/ServerCommands/Gitee/从Gitee提取报工.json b/ServerCommands/Gitee/从Gitee提取报工.json
new file mode 100644
index 00000000..dfed8106
--- /dev/null
+++ b/ServerCommands/Gitee/从Gitee提取报工.json
@@ -0,0 +1,332 @@
+{
+  "Name": "从Gitee提取报工",
+  "Enabled": true,
+  "Triggers": [
+    {
+      "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
+      "Permission": {
+        "PermissionData": {
+          "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
+          "permissionResource": {
+            "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
+          },
+          "permissionBindings": [
+            {
+              "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
+              "roleNames": [
+                "FGC_LoginUser"
+              ]
+            }
+          ]
+        }
+      },
+      "Parameters": [
+        {
+          "Name": "开始日期",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "2024-06-13"
+        },
+        {
+          "Name": "结束日期",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          }
+        },
+        {
+          "Name": "用户",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          },
+          "TestData": "Administrator"
+        }
+      ],
+      "InvokeTriggerTestData": {
+        "UserName": "Administrator"
+      }
+    }
+  ],
+  "Commands": [
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "用户",
+      "TableValue": {
+        "TableName": "用户信息视图",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "4228fb3e-a8a6-4dbb-b3cc-bce5b3011435",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "GIT用户名",
+              "GUID": "5879fc09-08fa-451a-a355-b26d486f8c31"
+            },
+            "ColumnName": "GIT用户名"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "用户信息视图",
+            "ColumnName": "用户名",
+            "GUID": "24bb73b2-b153-4756-85c1-7b2af8af884d"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=用户"
+          }
+        },
+        "NullFormulaValueQueryPolicy": 0,
+        "TopCount": "1"
+      },
+      "ID": "b4030fac6e4643919f2d70820325c4bf"
+    },
+    {
+      "$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": "=用户.GIT用户名"
+              }
+            },
+            "value": "%Null%",
+            "compareType": 1
+          },
+          "CommandList": [
+            {
+              "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+              "ParameterName": "计算天数",
+              "ParameterValue": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")"
+              },
+              "ID": "839247702b97432483704b323205cd67"
+            },
+            {
+              "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+              "ParameterName": "总工时",
+              "ParameterValue": "0",
+              "ID": "73122483179048b18313028406573a8f"
+            },
+            {
+              "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
+              "LoopInfo": {
+                "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
+                "LoopCount": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=计算天数"
+                },
+                "LoopIndexParamName": "index",
+                "LoopItemParamName": "当前天数"
+              },
+              "CommandList": [
+                {
+                  "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                  "ParameterName": "当前日期",
+                  "ParameterValue": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=开始日期+index-1"
+                  },
+                  "ID": "16028728d41c48a6a213d0ebd8d32b2e"
+                },
+                {
+                  "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                  "ParameterName": "Gitee事件",
+                  "TableValue": {
+                    "TableName": "Git_事件记录",
+                    "BindingInfos": [
+                      {
+                        "GUID": "07b5b976-2ddd-4e1c-b61a-a27412db7d04",
+                        "BindingInfo": {
+                          "TableName": "Git_事件记录",
+                          "ColumnName": "日期",
+                          "GUID": "12eed73a-37a4-4ab4-9850-53a04c017263"
+                        },
+                        "ColumnName": "日期"
+                      },
+                      {
+                        "GUID": "0cc165a2-d802-4923-bca3-e8450105b7bd",
+                        "BindingInfo": {
+                          "TableName": "Git_事件记录",
+                          "ColumnName": "事件内容",
+                          "GUID": "c2d0070c-3266-465c-865d-90e48ee75302"
+                        },
+                        "ColumnName": "事件内容"
+                      }
+                    ],
+                    "SqlCondition": {
+                      "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                      "SubConditions": [
+                        {
+                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                          "ColumnBindingInfo": {
+                            "TableName": "Git_事件记录",
+                            "ColumnName": "git用户名",
+                            "GUID": "0057124f-d1b6-4f02-a3d8-1affcc691fed"
+                          },
+                          "Value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=用户.GIT用户名"
+                          }
+                        },
+                        {
+                          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                          "ColumnBindingInfo": {
+                            "TableName": "Git_事件记录",
+                            "ColumnName": "日期",
+                            "GUID": "6f2040a7-9a8d-449f-982d-85c6c73ab517"
+                          },
+                          "Value": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=当前日期"
+                          }
+                        }
+                      ]
+                    },
+                    "NullFormulaValueQueryPolicy": 0,
+                    "OrderBySqlCondition": {
+                      "OrderByColumns": [
+                        {
+                          "ColumnBindingInfo": {
+                            "TableName": "Git_事件记录",
+                            "ColumnName": "日期",
+                            "GUID": "d1eb816a-334f-46ce-9738-4740009be374"
+                          },
+                          "Order": 0
+                        }
+                      ]
+                    }
+                  },
+                  "ID": "ee6c5b8e973045dba953f276a0654008"
+                },
+                {
+                  "$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": "=Gitee事件.Count"
+                          }
+                        },
+                        "value": "0",
+                        "compareType": 2
+                      },
+                      "CommandList": [
+                        {
+                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                          "ParameterName": "最小时间",
+                          "ParameterValue": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=Gitee事件.0.日期"
+                          },
+                          "ID": "16f04d70627b4c23bd50fd5af94bc002"
+                        },
+                        {
+                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                          "ParameterName": "最大时间",
+                          "ParameterValue": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=GETPARAM(\"Gitee事件.\"&Gitee事件.Count-1&\".日期\")"
+                          },
+                          "ID": "ee7c067b599447098af7b945afb6f01b"
+                        },
+                        {
+                          "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
+                          "InParamater": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=Gitee事件"
+                          },
+                          "Operation": 16,
+                          "OperationParamaterAName": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=CHAR(10)"
+                          },
+                          "OperationParamaterBName": "事件内容",
+                          "OutParamaterName": "事件内容拼接"
+                        },
+                        {
+                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                          "ParameterName": "今日工时",
+                          "ParameterValue": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=IFERROR(ROUND((最大时间-最小时间)*24,1),0)"
+                          },
+                          "ID": "be9fc47d15544d86a333c2072f2bde64"
+                        },
+                        {
+                          "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                          "ParameterName": "总工时",
+                          "ParameterValue": {
+                            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                            "SerializeProperty": "=总工时+今日工时"
+                          },
+                          "ID": "ccb605ff743244d99d745fad3c9a21a0"
+                        }
+                      ],
+                      "ID": "99086d22-0b81-4634-9ce0-0f2f4e7b3153"
+                    },
+                    {
+                      "CommandList": [
+                        {
+                          "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                          "ErrorCode": "0",
+                          "Message": "无今日Gitee签入或签出记录",
+                          "CustomReturns": [
+                            {
+                              "ReturnPropertyName": "工时"
+                            },
+                            {
+                              "ReturnPropertyName": "工作内容"
+                            }
+                          ]
+                        }
+                      ],
+                      "ID": "281e736c-4b4f-464a-a2d0-979f3a0072cd"
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
+          "ID": "d41dd9b6-a1b7-4d5e-a315-f5bcf5f4bd5b"
+        },
+        {
+          "CommandList": [
+            {
+              "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+              "ErrorCode": "400",
+              "Message": "您尚未设置Gitee信息，请前往\"个人中心\"设置后再试",
+              "CustomReturns": [
+                {
+                  "ReturnPropertyName": "工时"
+                },
+                {
+                  "ReturnPropertyName": "工作内容"
+                }
+              ]
+            }
+          ],
+          "ID": "215c583f-1e78-4578-a6a6-720c352259dc"
+        }
+      ]
+    }
+  ],
+  "ReturnProperties": [
+    {
+      "Name": "工时"
+    },
+    {
+      "Name": "工作内容"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json
index 957bbf09..1f0ddd12 100644
--- a/ServerCommands/汇报/根据汇报模板生成内容.json
+++ b/ServerCommands/汇报/根据汇报模板生成内容.json
@@ -330,7 +330,7 @@
               ]
             }
           ],
-          "ID": "82f93294-3dd3-45ce-a5d8-16d5d0da465e"
+          "ID": "cee677ad-de03-4da1-b645-913b5611c298"
         }
       ]
     },
@@ -376,7 +376,7 @@
         "TableValueType": 1,
         "BindingInfos": [
           {
-            "GUID": "80ed5a4f-ff78-40ef-8307-9c62389ca5ab",
+            "GUID": "3ccc0c13-130a-49a9-bf47-4f288b619f2f",
             "BindingInfo": {
               "TableName": "汇报模板",
               "ColumnName": "模板内容",
@@ -397,21 +397,7 @@
         "NullFormulaValueQueryPolicy": 0,
         "TopCount": "1"
       },
-      "ID": "b6b2fdb85de741729261a8401825e36c"
-    },
-    {
-      "$type": "MustachePlugin.Render, MustachePlugin",
-      "DataSrouce": {
-        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-        "SerializeProperty": "=日报模板.模板内容"
-      },
-      "UseCustomsDataHash": true,
-      "CustomsDataHash": {
-        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-        "SerializeProperty": "=数据源"
-      },
-      "SetMaxRecursionDepth": 512,
-      "ResultTo": "输出结果"
+      "ID": "a84cfa225a7c4b12b51e30a3b36c833e"
     },
     {
       "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
diff --git a/Tables/Git/Git_事件记录.json b/Tables/Git/Git_事件记录.json
index e67c061d..4d191e28 100644
--- a/Tables/Git/Git_事件记录.json
+++ b/Tables/Git/Git_事件记录.json
@@ -1,5 +1,6 @@
 {
   "Name": "Git_事件记录",
+  "ShowBuiltInFields": true,
   "Columns": [
     {
       "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
@@ -81,6 +82,37 @@
       "Name": "git用户名",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "DatabaseColumnType": "datetime",
+      "MaxLength": -1,
+      "Name": "日期",
+      "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+      "BindingInfo": {
+        "TableName": "Git_事件记录",
+        "ColumnName": "日期",
+        "GUID": "1c2feb6b-63a1-41d2-89ee-e9bb95aa8e70"
+      },
+      "AggregateFunction": 2,
+      "DataColumnName": "日期",
+      "Name": "最大日期",
+      "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
+    {
+      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+      "BindingInfo": {
+        "TableName": "Git_事件记录",
+        "ColumnName": "日期",
+        "GUID": "f179f242-1364-4513-b577-ffc80f2fde57"
+      },
+      "AggregateFunction": 3,
+      "DataColumnName": "日期",
+      "Name": "最小日期",
+      "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
     {
       "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",