diff --git a/.collaboration b/.collaboration
index 9389f32b..2b9fce9d 100644
--- a/.collaboration
+++ b/.collaboration
@@ -285,17 +285,7 @@
   },
   {
     "ModuleName": "PCPage/任务-子任务列表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885232+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-子任务列表.json",
-      "Pages\\558ca610fafc4ffd8884b819161bfd6.json"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/任务-关联资源",
@@ -303,17 +293,7 @@
   },
   {
     "ModuleName": "PCPage/任务-工时",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:03:15.1324678+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-工时.json",
-      "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/任务-进展",
@@ -331,154 +311,49 @@
     "ModuleName": "PCPage/新增进展",
     "ModuleType": 1
   },
-  {
-    "ModuleName": "TableView/子任务视图",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8884066+08:00",
-    "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\项目任务\\子任务视图.json",
-      "ForguncyDB.sqlite3"
-    ],
-    "ExclusiveType": 0
-  },
   {
     "ModuleName": "TableView/用户信息视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885262+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\用户信息视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/用户组织关系视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885275+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\用户组织关系视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/角色信息视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.888529+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\角色信息视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/角色分类关系视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885301+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\角色分类关系视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/用户角色关系视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885314+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\用户角色关系视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/角色组织关系视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885325+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\角色组织关系视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/角色拥有权限视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885343+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\角色拥有权限视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/组织信息视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885361+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\组织信息视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
     "ModuleName": "TableView/组织级别视图",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:10:57.8885373+08:00",
     "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\用户\\组织级别视图.json",
-      "ForguncyDB.sqlite3"
-    ],
     "ExclusiveType": 0
   },
   {
@@ -495,17 +370,7 @@
   },
   {
     "ModuleName": "PCPage/工时详情",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:02:14.6313129+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\工时详情.json",
-      "Pages\\31a709cea02e45ad83bb92336a6d829.json"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/工时详情-列头",
@@ -513,17 +378,7 @@
   },
   {
     "ModuleName": "UserControlPage/工时记录列表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T19:08:44.3915704+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\工时记录列表.json",
-      "Pages\\36d33d0079644f28b16bd0fec90394c.json"
-    ]
+    "ModuleType": 31
   },
   {
     "ModuleName": "TableView/View_任务工时统计",
@@ -539,42 +394,14 @@
   },
   {
     "ModuleName": "PCPage/新增报工",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T18:58:15.7034391+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\工时\\新增报工.json"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "ServerCommands/工时",
     "ModuleType": 20
   },
-  {
-    "ModuleName": "ServerCommand/新增报工",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T18:58:06.2131968+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\工时\\新增报工.json"
-    ]
-  },
   {
     "ModuleName": "ServerCommand/新增工时",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-01T18:58:06.2131989+08:00",
     "ModuleType": 15
   }
 ]
\ No newline at end of file
diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3
index 619b2611..3966e59a 100644
Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ
diff --git a/Pages/任务/任务-工时.json b/Pages/任务/任务-工时.json
index 5b8b8119..3e2a747c 100644
--- a/Pages/任务/任务-工时.json
+++ b/Pages/任务/任务-工时.json
@@ -189,6 +189,21 @@
     "3,26": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PageName": "新增报工",
+            "PassValues": [
+              {
+                "Source": "计划",
+                "TargetCell": {
+                  "SerializeProperty": "=新增报工!L4"
+                }
+              }
+            ],
+            "LoadBindingDataOption": 1
+          }
+        ],
         "Text": "计划工时",
         "TemplateKey": "Gost",
         "Icon": {
@@ -222,6 +237,21 @@
     "7,26": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PageName": "新增报工",
+            "PassValues": [
+              {
+                "Source": "实际",
+                "TargetCell": {
+                  "SerializeProperty": "=新增报工!L4"
+                }
+              }
+            ],
+            "LoadBindingDataOption": 1
+          }
+        ],
         "Text": "实际工时",
         "TemplateKey": "Gost",
         "Icon": {
@@ -579,4 +609,4 @@
       "Size": "894,52"
     }
   ]
-}//DGAuRnfWf93Eh2k9C2q761vDCkxoS2ruHhPDA/Adhaxn7zK25qvCm7qRU/e+13Jl76ZSpxTj51O6dGcD0PUciEGMDSMnK2orXhN7bfe9UZ2OpEdJmDwz9aa6M4a5i7/Tk4KVID9nGiGsT4gWOltZExbsMaZf00aKs9MoxbONKMlnJemS/CjKE9y8bzNnQ9NGxjlvTp9LgDsS9ZkrTtKb1Vwr2QlHqYwFhq+wwEqtGYA56wOPm3HPDdslqEvYp246v9Po8y3j/lDc5ctNuJ/JfVKPWZVA+OUilaGkuHnOsLTQaLCHe7/FSW8C7flDgrIkMofiPlE6M3ZL4ut9ehWBMCDgp6AtoeSWGyr76sE/QAECXhoC0SCAIirJPMl2+VuhGdVQ1SEYvDTuSu9u+pf2ZZpy4DUFxbyMLys+iHmQm8GLmguELkGgfg1j/PrsP0Fj03CwMxiOIXG37/KrsZA7mcrN8icdSf8vIqh0qTpkWJcO7Ak8dPTxoElatCSkBWkyRxHJdwx/egPFrUf7hRB9HuRmtb3AYr6YRVbfDoVDdX3LeVmM2KPjuLYb9FSBVknWZwnxWSIsrg/FhibrU2kka6xCZ93eG5GhPg9KV4Ee1vfWaGcF+8Eeni4agFbpQntrucDO2IHtCorNOzXbCXkKbIL+Es6jCVEahmVpqemK/epasEV/v1+bguFHSLD3Tua0Xq5IUVjC+LFv6xAGHhMVWtjO8xK9OQ4+b1PryAvjS1/83qyIdlgemrCyPjwKbhxNy55QSEh4e38DjhxQsiOlFNUKk0gcR+3j9/ktOoxIioWJ9EsSsPTHmZQJCyHBbyawCPLprxW0q1GM1CbY+/SWmRiE2hd5KuPkfQ/WlShbeJY4hxN/5PES4qSa/RzHw0R/3+peFrU+q2z/NEsXS88Y0w==|920
\ No newline at end of file
+}//oZLVUVKJXKt0djD/4ou4aL8sGwQt6m0ls1+maH7iJ3/eW9mI5/xA/1ksBRv+MKPOBwnQ4NPjGed2ODh2KZw+Ep0Us5j0R5RuDHgpQM4j0ljNdbOzA0rT+61Z+BKdYRyJz0eimRzeOQ3JnvZZb8YSKeJlOm+3ULxuxPCMVp+DojXgJcWJEYOZcN7JmpSbSDKVqySlj5Zs5dOtSBGx8asHSFQbdzB30mEHs/g8HPaqti8Bjui923netzayoc/g9QcqyDxgeQZc+GO6WukcN2mnCb2VfIWTprhJQEu6v8bYl+vHlYGcrH6ykxDSO5eOcWrkPQWK1gmWS7AIs1c3kpOFEBaUvqIgauWSfusheWlMCvKzn2bkG4xrZOU/1zgb+17V4m+9WUZ0P7Kul9L19wJyM0DG3hRtp9cj4Bxn7YybXgd5xD0tB16+GqyXwcCVGDDEq6VBFknxGSVkx4LnSPhO/kFoo3+cCylqtB23VRCvYAnvE0WB9D8U7B3iWTaOH7FbaLeXp0M9J4eCHz5qS2b52C/qtS8ZJNat165pYM1zm0bZbAK1bh+vGQU4cNv/NfjpMAxHxrvQaS3MsK0AYn29s7DRkiRRa2DwBO71xo1mC6Plr332EY/Vzz8vfVhaTHxqUvQOYgwCvYqPlPle1txth5kXXcJ0Ds/J3qItR6Xf/MSNeW8NKhTgnrjim+ZhOkWLZRc3mAYEnpzpglkKy4J6ygEw7GChFl+z0Znek5Pheaz8kbEYXFMUdC0vkvrpNpjPc0CZoBgbbyItuwVnTB8N+zZmKNJcSHdg9q2itAa22M20kp6oRVr9jS1V1ByoeJw3V7jqv5TJkd5TKjqhPeYByqifv7uqGwb5CgkdImSIsIgmrJmpDQBM5kKc3H5fTgqPPfnLAPAQDn6MAi4ddG8vtg==|920
\ No newline at end of file
diff --git a/Pages/任务/工时/新增报工.json b/Pages/任务/工时/新增报工.json
index ed9581d2..d63b7240 100644
--- a/Pages/任务/工时/新增报工.json
+++ b/Pages/任务/工时/新增报工.json
@@ -16,6 +16,11 @@
           "DesignLengthInPixel": 35.0
         }
       },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
       "6": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 10.0
@@ -36,11 +41,6 @@
           "DesignLengthInPixel": 35.0
         }
       },
-      "13": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
-        }
-      },
       "14": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 10.0
@@ -48,12 +48,13 @@
       },
       "15": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
+          "DesignLengthInPixel": 177.0
         }
       },
       "16": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
+          "DesignLengthInPixel": 12.0,
+          "Mode": 1
         }
       },
       "17": {
@@ -61,27 +62,42 @@
           "DesignLengthInPixel": 24.0
         }
       },
-      "12": {
+      "18": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 68.0
+          "DesignLengthInPixel": 10.0
         }
       },
-      "18": {
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "22": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 27.0
         }
       },
-      "19": {
+      "23": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 27.0
         }
       }
     },
     "InLogicalVisibleIndexes": [
-      18,
-      19
+      22,
+      23
     ],
-    "Count": 20
+    "Count": 24
   },
   "Cols": {
     "RowColumnAttachedInfos": {
@@ -204,28 +220,24 @@
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
         }
-      },
-      "24": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "25": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
       }
     },
-    "Count": 26,
+    "Count": 24,
     "DefaultSize": 32.0
   },
   "Values": {
     "1,1": "工时执行者",
-    "1,11": "执行时间",
-    "5,1": "实际工时数",
-    "9,1": "工作进展",
-    "16,1": "取消",
-    "16,22": "提交"
+    "1,11": "工时类型",
+    "3,1": "%CurrentUser.UserName%",
+    "3,11": "计划",
+    "5,1": "执行时间",
+    "9,1": "实际工时数",
+    "13,1": "工作进展",
+    "20,1": "取消",
+    "20,20": "提交"
+  },
+  "Formulas": {
+    "7,1": "TODAY()&\",\"&TODAY()"
   },
   "AttachInfos": {
     "3,1": {
@@ -246,6 +258,8 @@
             ]
           }
         ],
+        "DefaultValue": "%CurrentUser.UserName%",
+        "useBinding": true,
         "options": [
           {
             "value": "黄金糕",
@@ -268,6 +282,29 @@
             "label": "北京烤鸭"
           }
         ],
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "用户信息视图",
+          "BindingInfos": [
+            {
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "用户名",
+                "GUID": "a84f0f1b-ce80-496d-94bd-46f27c9ba3ba"
+              },
+              "ColumnName": "value"
+            },
+            {
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "全名",
+                "GUID": "c9617d6f-d5aa-4322-9766-60df8c1644a5"
+              },
+              "ColumnName": "label"
+            }
+          ],
+          "CustomColumns": []
+        },
         "placeholder": "请选择",
         "noDataText": "无数据",
         "filterInServerOptions": {
@@ -280,7 +317,7 @@
         "IgnoreBlank": false
       }
     },
-    "3,11": {
+    "7,1": {
       "CellType": {
         "$type": "ElementUI.DatePickerCellType, ElementUI",
         "CommandList": [],
@@ -315,7 +352,7 @@
         "IgnoreBlank": false
       }
     },
-    "7,1": {
+    "11,1": {
       "CellType": {
         "$type": "ElementUI.InputNumberCellType, ElementUI",
         "CommandList": [],
@@ -347,7 +384,7 @@
         "IgnoreBlank": false
       }
     },
-    "11,1": {
+    "15,1": {
       "CellType": {
         "$type": "ElementUI.InputCellType, ElementUI",
         "CommandList": [],
@@ -371,12 +408,12 @@
             ]
           }
         ],
-        "type": "text",
+        "type": "textarea",
         "placeholder": "请输入",
         "resize": "none"
       }
     },
-    "16,1": {
+    "20,1": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -388,25 +425,164 @@
         "TemplateKey": "_RS_Information3"
       }
     },
-    "16,22": {
+    "20,20": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+            "Title": "加载中"
+          },
+          {
+            "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+            "TargetPageElement": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=新增报工!B8"
+            },
+            "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": "新增工时",
+            "Parameters": [
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "任务ID",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!任务ID"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "开始日期",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!开始日期"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "结束日期",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!结束日期"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "执行者",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!B4"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "工时数",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!B12"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "进展内容",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!B16"
+                }
+              },
+              {
+                "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                "ParamName": "工时类型",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=新增报工!L4"
+                }
+              }
+            ],
+            "ResultErrorCodeTo": {
+              "SerializeProperty": "code"
+            },
+            "ResultMessageTo": {
+              "SerializeProperty": "msg"
+            },
+            "RefreshAfterFinish": true,
+            "CheckDataValidation": true
+          },
+          {
+            "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
+            "FunctionName": "remove",
+            "Title": "加载中"
+          },
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                    "cellLocations": [
+                      {
+                        "SerializeProperty": "=新增报工!code"
+                      }
+                    ]
+                  },
+                  "value": "0"
+                },
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+                    "Message": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=新增报工!msg"
+                    }
+                  },
+                  {
+                    "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+                    "ReloadData": true
+                  }
+                ],
+                "ID": "776a9d7f-8391-4fc3-a140-f33eb3a6fab8"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+                    "FunctionName": "warning",
+                    "Title": "温馨提示",
+                    "Message": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=新增报工!msg"
+                    },
+                    "BtnText": "知道了"
+                  }
+                ],
+                "ID": "a87ca321-e070-465b-8dd2-9ba8d3d9408b"
+              }
+            ]
+          }
+        ],
         "Text": "提交",
         "TemplateKey": "_RS_Main1"
       }
     },
-    "18,1": {
+    "22,1": {
       "BindingInfo": {
-        "TableName": "任务工时表",
-        "ColumnName": "项目ID",
-        "GUID": "1ffb3032-3c31-4c3a-9121-3c0f4bf00408"
-      }
-    },
-    "18,4": {
-      "BindingInfo": {
-        "TableName": "任务工时表",
-        "ColumnName": "任务ID",
-        "GUID": "c6081db5-563c-4b7f-b4d8-949f0301031a"
+        "TableName": "任务表",
+        "ColumnName": "ID",
+        "GUID": "888da7a1-d20d-42b9-ae61-f0ae6ae5fe82"
       }
     }
   },
@@ -437,6 +613,23 @@
         "FontFamily": 1,
         "FontSize": 13.333333333333332,
         "Formatter": 2
+      },
+      {
+        "Background": 4,
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "BorderBottom": 1,
+        "BorderTop": 1,
+        "BorderLeft": 1
+      },
+      {
+        "BorderBottom": 1,
+        "BorderTop": 1
+      },
+      {
+        "BorderBottom": 1,
+        "BorderTop": 1,
+        "BorderRight": 1
       }
     ],
     "Types": {
@@ -444,11 +637,16 @@
         "Background 1 -50",
         "Body",
         "[AUTO]General",
-        "Background 2 -10"
+        "Background 2 -10",
+        "#FFFFFF00",
+        "black"
       ],
       "Borders": [
         {
           "Color": 3
+        },
+        {
+          "Color": 5
         }
       ]
     },
@@ -461,7 +659,6 @@
       "1,15": 2,
       "1,16": 2,
       "1,17": 2,
-      "1,18": 2,
       "2,11": 2,
       "2,12": 2,
       "2,13": 2,
@@ -469,92 +666,109 @@
       "2,15": 2,
       "2,16": 2,
       "2,17": 2,
-      "2,18": 2,
       "3,11": 2,
-      "5,1": 1,
+      "4,0": 2,
+      "4,1": 2,
+      "4,2": 2,
+      "4,3": 2,
+      "4,4": 2,
+      "4,5": 2,
+      "4,6": 2,
+      "4,7": 2,
+      "4,8": 2,
+      "4,9": 2,
+      "4,10": 2,
+      "4,11": 2,
+      "4,12": 2,
+      "4,13": 2,
+      "4,14": 2,
+      "4,15": 2,
+      "4,16": 2,
+      "4,17": 2,
+      "4,18": 2,
+      "4,19": 2,
+      "4,20": 2,
+      "4,21": 2,
+      "4,22": 2,
+      "4,23": 2,
+      "5,0": 2,
+      "5,1": 3,
+      "5,2": 2,
+      "5,3": 2,
+      "5,4": 2,
+      "5,5": 2,
+      "5,6": 2,
+      "5,7": 2,
+      "5,8": 2,
+      "5,9": 2,
+      "5,10": 2,
+      "5,12": 2,
+      "5,13": 2,
+      "5,14": 2,
+      "5,15": 2,
+      "5,16": 2,
+      "5,17": 2,
+      "5,18": 2,
+      "5,19": 2,
+      "5,20": 2,
+      "5,21": 2,
+      "5,22": 2,
+      "5,23": 2,
+      "6,0": 2,
+      "6,1": 2,
+      "6,2": 2,
+      "6,3": 2,
+      "6,4": 2,
+      "6,5": 2,
+      "6,6": 2,
+      "6,7": 2,
+      "6,8": 2,
+      "6,9": 2,
+      "6,10": 2,
+      "6,11": 2,
+      "6,12": 2,
+      "6,13": 2,
+      "6,14": 2,
+      "6,15": 2,
+      "6,16": 2,
+      "6,17": 2,
+      "6,18": 2,
+      "6,19": 2,
+      "6,20": 2,
+      "6,21": 2,
+      "6,22": 2,
+      "6,23": 2,
+      "7,0": 2,
       "7,1": 2,
-      "8,0": 2,
-      "8,1": 2,
-      "8,2": 2,
-      "8,3": 2,
-      "8,4": 2,
-      "8,5": 2,
-      "8,6": 2,
-      "8,7": 2,
-      "8,8": 2,
-      "8,9": 2,
-      "8,10": 2,
-      "8,11": 2,
-      "8,12": 2,
-      "8,13": 2,
-      "8,14": 2,
-      "8,15": 2,
-      "8,16": 2,
-      "8,17": 2,
-      "8,18": 2,
-      "8,19": 2,
-      "8,20": 2,
-      "8,21": 2,
-      "8,22": 2,
-      "8,23": 2,
-      "8,24": 2,
-      "8,25": 2,
-      "9,0": 2,
-      "9,1": 3,
-      "9,2": 2,
-      "9,3": 2,
-      "9,4": 2,
-      "9,5": 2,
-      "9,6": 2,
-      "9,7": 2,
-      "9,8": 2,
-      "9,9": 2,
-      "9,10": 2,
-      "9,11": 2,
-      "9,12": 2,
-      "9,13": 2,
-      "9,14": 2,
-      "9,15": 2,
-      "9,16": 2,
-      "9,17": 2,
-      "9,18": 2,
-      "9,19": 2,
-      "9,20": 2,
-      "9,21": 2,
-      "9,22": 2,
-      "9,23": 2,
-      "9,24": 2,
-      "9,25": 2,
-      "10,0": 2,
-      "10,1": 2,
-      "10,2": 2,
-      "10,3": 2,
-      "10,4": 2,
-      "10,5": 2,
-      "10,6": 2,
-      "10,7": 2,
-      "10,8": 2,
-      "10,9": 2,
-      "10,10": 2,
-      "10,11": 2,
-      "10,12": 2,
-      "10,13": 2,
-      "10,14": 2,
-      "10,15": 2,
-      "10,16": 2,
-      "10,17": 2,
-      "10,18": 2,
-      "10,19": 2,
-      "10,20": 2,
-      "10,21": 2,
-      "10,22": 2,
-      "10,23": 2,
-      "10,24": 2,
-      "10,25": 2,
-      "11,0": 2,
+      "7,23": 2,
+      "9,1": 1,
       "11,1": 2,
-      "11,25": 2,
-      "13,1": 2,
+      "12,0": 2,
+      "12,1": 2,
+      "12,2": 2,
+      "12,3": 2,
+      "12,4": 2,
+      "12,5": 2,
+      "12,6": 2,
+      "12,7": 2,
+      "12,8": 2,
+      "12,9": 2,
+      "12,10": 2,
+      "12,11": 2,
+      "12,12": 2,
+      "12,13": 2,
+      "12,14": 2,
+      "12,15": 2,
+      "12,16": 2,
+      "12,17": 2,
+      "12,18": 2,
+      "12,19": 2,
+      "12,20": 2,
+      "12,21": 2,
+      "12,22": 2,
+      "12,23": 2,
+      "13,0": 2,
+      "13,1": 3,
       "13,2": 2,
       "13,3": 2,
       "13,4": 2,
@@ -577,37 +791,87 @@
       "13,21": 2,
       "13,22": 2,
       "13,23": 2,
-      "13,24": 2,
-      "14,1": 4,
-      "14,2": 4,
-      "14,3": 4,
-      "14,4": 4,
-      "14,5": 4,
-      "14,6": 4,
-      "14,7": 4,
-      "14,8": 4,
-      "14,9": 4,
-      "14,10": 4,
-      "14,11": 4,
-      "14,12": 4,
-      "14,13": 4,
-      "14,14": 4,
-      "14,15": 4,
-      "14,16": 4,
-      "14,17": 4,
-      "14,18": 4,
-      "14,19": 4,
-      "14,20": 4,
-      "14,21": 4,
-      "14,22": 4,
-      "14,23": 4,
-      "14,24": 4,
-      "16,1": 5,
-      "16,2": 2,
-      "16,3": 2,
-      "18,4": 2,
-      "18,5": 2,
-      "18,6": 2
+      "14,0": 2,
+      "14,1": 2,
+      "14,2": 2,
+      "14,3": 2,
+      "14,4": 2,
+      "14,5": 2,
+      "14,6": 2,
+      "14,7": 2,
+      "14,8": 2,
+      "14,9": 2,
+      "14,10": 2,
+      "14,11": 2,
+      "14,12": 2,
+      "14,13": 2,
+      "14,14": 2,
+      "14,15": 2,
+      "14,16": 2,
+      "14,17": 2,
+      "14,18": 2,
+      "14,19": 2,
+      "14,20": 2,
+      "14,21": 2,
+      "14,22": 2,
+      "14,23": 2,
+      "15,0": 2,
+      "15,1": 2,
+      "15,23": 2,
+      "17,1": 2,
+      "17,2": 2,
+      "17,3": 2,
+      "17,4": 2,
+      "17,5": 2,
+      "17,6": 2,
+      "17,7": 2,
+      "17,8": 2,
+      "17,9": 2,
+      "17,10": 2,
+      "17,11": 2,
+      "17,12": 2,
+      "17,13": 2,
+      "17,14": 2,
+      "17,15": 2,
+      "17,16": 2,
+      "17,17": 2,
+      "17,18": 2,
+      "17,19": 2,
+      "17,20": 2,
+      "17,21": 2,
+      "17,22": 2,
+      "18,1": 4,
+      "18,2": 4,
+      "18,3": 4,
+      "18,4": 4,
+      "18,5": 4,
+      "18,6": 4,
+      "18,7": 4,
+      "18,8": 4,
+      "18,9": 4,
+      "18,10": 4,
+      "18,11": 4,
+      "18,12": 4,
+      "18,13": 4,
+      "18,14": 4,
+      "18,15": 4,
+      "18,16": 4,
+      "18,17": 4,
+      "18,18": 4,
+      "18,19": 4,
+      "18,20": 4,
+      "18,21": 4,
+      "18,22": 4,
+      "20,1": 5,
+      "20,2": 2,
+      "20,3": 2,
+      "22,1": 6,
+      "22,2": 7,
+      "22,3": 7,
+      "22,4": 7,
+      "22,5": 8,
+      "22,6": 2,
+      "22,7": 2
     },
     "SheetStyle": {
       "FontFamily": 1,
@@ -615,14 +879,14 @@
     }
   },
   "Spans": [
-    "3,11,1,14",
+    "11,1,1,22",
+    "15,1,2,22",
+    "20,20,1,3",
+    "20,1,1,3",
+    "7,1,1,22",
+    "3,11,1,12",
     "3,1,1,8",
-    "7,1,1,24",
-    "11,1,2,24",
-    "16,22,1,3",
-    "18,4,1,3",
-    "18,1,1,3",
-    "16,1,1,3"
+    "22,1,1,5"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -641,7 +905,8 @@
       ]
     },
     "RowBreakLines": [],
-    "RepeatRangeSettings": []
+    "RepeatRangeSettings": [],
+    "RelatedDataTableName": "任务表"
   },
   "PrintInfo": {
     "PaperSize": {},
@@ -650,11 +915,7 @@
   "CustomNames": [
     {
       "Name": "任务ID",
-      "Formula": "新增报工!$E$19"
-    },
-    {
-      "Name": "项目ID",
-      "Formula": "新增报工!$B$19"
+      "Formula": "新增报工!$B$23"
     }
   ]
-}//CnjH7EQqo5/KhS3tEK/a/oM/5T6L1jA/KVWnsEFXjQvWcqvD712oCLt6sYMyifbiiTn3v2pxftv0E8gwsIFa+mx3lK60YKY5rh7gdWJOrEww5F8kuksB5fuSwIs+R/8ObftvSjLoo2YT0iAVhS0agYhu72b4v9xsqBONlrlV7L5BuER8APuGfhkYD4uRgZXn8fD76zky89/tCa8CebkKGH/IFfCLOOMBsDEa/P2oqFX2XVfgAu38Lr7jLITU0yEA9XPgiSL2OBUDLPiXKoeErwjPBveUBUWuYUC/u3OtO3KBX6DYOvaUT9TImLauH5cj1WB797x00h6Zw8uRbCNYRZDDsMf+L635Ub0bCwXt2OqXcw7j2B9eaqvGHb/2LSjwrzdojLTuX8N4REagQqJjU5xxMohEUC5t2WlCGB9Wim5qKHWxL0u2v2MH3/2KH3nXVKn7gXsml1oTrSV42xarokIsjvctggM6i0mwe6YkHW2a+Bb6CA9kimuRsxVE0sfDOlSzvm4ZwNw/doIzDykzd2vjoScYkaSyULKmQjQOKEA6YsWRT6F2TU4hhotONLTf/K3petQW1E9EQo3/Tst9oTMagkugtLlL7bPDei8PktLf7Xc2VAINJzzfLZWkY/lmC0d+YTgIsQl3CyAqYWqsH66YaFaoueZnHnJkUBNWxCruDJ0l9nYiILbaTalO7dvh/HvzNIgirqiHlZ4r3ydSihKK7RlCeSfW+VTMmQB4UnA2Hj+P+PfJWWxC0H/6+ebpMVl9XAQDuwTW9qlRa0hMaROeZ35ZUjFlsH7dnW1u4VoQNXZo96C+BSZYdQeW5zJsotuGPAyrE/Tgy9HTfTTrvI4GjeLI6R69IMXXiIpFQD3WcBzWNd0dS8NsA+K2FNjj0pC1csGJfRXKfHsdd/RYEw==|920
\ No newline at end of file
+}//4vXL06d7vuOai9jLudocuGcK5uR6giRyEm2TWF2Hg4k8uKOieGDXIlJINJrHbM+j5ch0hY13MA8kCsVNA23zfO+DLfavrp9NotKTMSfrcBvQ/+5XmGcZ/5WxUwkzTxStuzaNdqTrC1vea/AdNjIS3i2J+jYItdzIthzOTuTVK/klt6vNZj4YkqybqkeuUtdwNRof68eb0pfWoBwayJ2FDQMN44/iABuo4WilSDAPLRGhlkC0/zhOwaewB1RLdYBaMM0wauDR6zdQfAhyClDGGvfDA24GVxTzy35i2utMHLN3KVuPaf42W1xl9QOc8swjKbyH6BRkL7Z/wrydum4YvzNNJdwfEURq7Ftw0+N5M0RYcVuyVqmaNFSPCKn970AyxCOV3/YO+7vxnhrKJuS4g01UcVqsGWjZKq6d2w9A4/EBiMFIaPRGMhYOGvHSrflN5nFBSJbCE+RPq6kWMXNne9dnULSW2iSWf6uNjBo0/8KwhGVRB5pB8Op1Sw/YZa/aIOydmWbvRJOs3aaxpM6zu4IOA+l8YZXuQcYqu0536AiJj17HXx4pnfI2QLH+uVq9Cq4TO8usxBRvG9mIKLcuElRNYHSBi0PfHl7gj92ienDE4GyaIwsfeS+U/LXr1SwZYVQtUPhFvB6yoko1n+J7n4ZgvAOwig1mESGopdD/h/3tyRJDMKFqLlF5jQrz/XBhPK/lYQHwJ3JKCcXXeJNb18c7HtZChzXvo26gXkVifo/Dvirb65Xhsjrtb7JhThD+AvrpdBlgx4gBBWT9DGSX9dXV9eBk9JDjmQ7k45GsOtMb+WgkRnpeDeYBfFtzVs+JtLXJviNlcttTiQQfiDalwv1UfaoP+2HdSY6jsZOfUEx1N/aEcVdzdYl1ZXhl10Y+nqqfi9FSnesEWnvWqyEKkA==|920
\ No newline at end of file
diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json
index f9d78d3f..4f4e8191 100644
--- a/Pages/任务/工时详情.json
+++ b/Pages/任务/工时详情.json
@@ -366,6 +366,21 @@
     "10,9": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PageName": "新增报工",
+            "PassValues": [
+              {
+                "Source": "计划",
+                "TargetCell": {
+                  "SerializeProperty": "=新增报工!L4"
+                }
+              }
+            ],
+            "LoadBindingDataOption": 1
+          }
+        ],
         "Text": "计划工时",
         "TemplateKey": "圆角浮动",
         "Icon": {
@@ -380,6 +395,21 @@
     "10,14": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PageName": "新增报工",
+            "PassValues": [
+              {
+                "Source": "实际",
+                "TargetCell": {
+                  "SerializeProperty": "=新增报工!Q4"
+                }
+              }
+            ],
+            "LoadBindingDataOption": 1
+          }
+        ],
         "Text": "实际工时",
         "TemplateKey": "圆角浮动",
         "Icon": {
@@ -645,4 +675,4 @@
       "Formula": "工时详情!$E$13"
     }
   ]
-}//wXGH785oPZl0wrrFd86sQElZP6EZ9bCdJOdQPY/PUjjWYpRROWXMIu8/BbEb3U2hvi+2lfGAS7/mJSe+in5NQFAkodiPWWIM4pTPJ7CfUxqF1LW6YJyh8Iy5DicfnIIBu/Oj8kvFf3JR1QQWYncdKW0c2S77RV63To3IoDLjgJo5mtFJTUKrVC+U4byVIaofqwmY+pdXRyMItlC8I5j0+ycSS0JyXplrBeFGpoZGn9Nov5zlWWuuRMCccajfknazhcbZDEkG+t2f8374eSo3TsMDY+XTooDREjH1I8dblXnroWkscv4XiUk2wTycNbnN8dYB1d0gYNek9WGiyDT/eNwpQSphiCeKLdN+wk8TpvrueC9W8MFkc3dYoCXO957eJyiQU0C25P21N6hVGIUeeZ6HLD6fk+EQLdbugIon9HQNLPyc087zWKodmWdQkwLAt+4wst5YNDH4tA1jRyEQvwnI5hJ9TqD1X6LP9kOXOp/g6G2S6IyJms+SrXfQas8FEOlflawTt9pI2PgBD0rODp9vhzjkHeW7KwqsfGkdxn7ZWrZA0jOvP8GiPLC699/WUI67yqvtq+0wBX5KvaS2PQjPyKmnLCdnYguvHlzuRzwBCF9ie1Hawe9ptZQiJV4DbyDqpLKUCkeHTjRFGw/InEcYusaJlzCrL+Dtb3+0BaCnI9CaaTCS8e3l1dqEO6d9Tpds/arAzPZGZPqXH+q4xnyNDG9amA1Ir8jfGCjcqn9SuPZiXR6sCzsIuX827+2JYJjD2HWPwC2rUE409dNIlmX2xhkyZ2ZiK/wykYS/GnEc+xoERJeUk8ycC2dPfkNlK1gpDm/R0587eg6y2PC+PIdUIj5Vqn8DyaVP2btuxqPX7UBQrJk6pT5VfviEBGnYWD0N6bknsA5JyqgXmyacjw==|920
\ No newline at end of file
+}//wpfwqLRVD7V6aMwi/ujNEkRzmB99x7fZre3K03sCVKwsmkKN+GlNCEuFPW+USS7/H8aQB/bCLzQVZoM6HOq3KF7S10aXAPJA1qqcyrRWiPmofI63bem0BJFW4bgsS00vd2KeqhV9xpFR4prQ0NgXmsO20QnVWc16rDkgP5KYY8wgAw1xBvwYvfKsjPpp5T0Df5zXchq8AVIpEYR9zUSzGJOk+nzuOTNyBDDVjIatCrvknrB98CnQtm+9IUIB/IuoubFDCj62sSN61910lRus5jpg6IwZqJuU6GfDOJr16RQDXHjb/8xTrniJGGjeOdsUiJcxnPSj97HiU0D1un2dSaxgdOkTbtUc0RpJ9Zi7qCLrbUcbSWqxc5WQjI+onzHKgsxonmC+0Y/XkmuG1Zl9cdb2MB4Dc5/k8YRS+oADHT25NPZS3meDeW9TMLQEC5xVEiA2HE861t9QVUofR5j5HLYUDxj9TIOORtmV5gPIJ2jeUpF26qwJha00BenlN9Adn5McMhZOxWyuSBUaKQSDSzsuqOc2IF8/JdG9ntl7QXbloHMlFIBm1NhKj3Vz7IAkEJCXqXVFtMXXEsjMcQxTfG7Z09ouWPVxO+FxrUz/Q5iwPMyX9fpmGzcfOC7ikxHK7pjqzcz+XAb4q/u7YUTO9sePhXaWOHjPUpX3TdOTiVuziz1BIOPNwEGmrgrYYTZh/qkb6AbW+hu1n4UQ8s98QxF1jj+NIGZwx5SjZLsq7o5hTo89M0ulUoUEZmHmgmpw7FVzzzlAmFnup6bcxkADYKtNgkhl4dazUMiBfp0Ig3O6n0rJBom6EYdwgK5ESsapKNoiXd1AgrSjmxh1YpDkshyzxRvan0wTRRCY329kAyOrtAupevKF9suoBDQIIaDMabdfOZt+/n1xhN96hjWNvA==|920
\ No newline at end of file
diff --git a/ServerCommands/工时/新增报工.json b/ServerCommands/工时/新增工时.json
similarity index 89%
rename from ServerCommands/工时/新增报工.json
rename to ServerCommands/工时/新增工时.json
index 2857ec0b..09f48d90 100644
--- a/ServerCommands/工时/新增报工.json
+++ b/ServerCommands/工时/新增工时.json
@@ -1,5 +1,5 @@
 {
-  "Name": "新增报工",
+  "Name": "新增工时",
   "Enabled": true,
   "Triggers": [
     {
@@ -25,42 +25,52 @@
           "Name": "任务ID",
           "DataValidationInfo": {
             "IgnoreBlank": false
-          }
+          },
+          "TestData": "2"
         },
         {
           "Name": "开始日期",
           "DataValidationInfo": {
             "IgnoreBlank": false
-          }
+          },
+          "TestData": "2024-03-01"
         },
         {
           "Name": "结束日期",
           "DataValidationInfo": {
             "IgnoreBlank": false
-          }
+          },
+          "TestData": "2024-03-10"
         },
         {
           "Name": "执行者",
           "DataValidationInfo": {
             "IgnoreBlank": false
-          }
+          },
+          "TestData": "administrator"
         },
         {
           "Name": "工时数",
           "DataValidationInfo": {
             "IgnoreBlank": false
-          }
+          },
+          "TestData": "40"
         },
         {
-          "Name": "进展内容"
+          "Name": "进展内容",
+          "TestData": "测试"
         },
         {
           "Name": "工时类型",
           "DataValidationInfo": {
             "IgnoreBlank": false
-          }
+          },
+          "TestData": "计划"
         }
-      ]
+      ],
+      "InvokeTriggerTestData": {
+        "UserName": "Administrator"
+      }
     }
   ],
   "Commands": [
@@ -79,7 +89,7 @@
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "项目ID",
-                    "GUID": "76e8039a-2ce0-4c74-9879-63da073db9ee"
+                    "GUID": "476915c6-9f07-472d-811d-e9bf755d9a86"
                   },
                   "ColumnName": "项目ID"
                 },
@@ -87,7 +97,7 @@
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "任务状态",
-                    "GUID": "c45d8519-bfff-4a2d-9e43-2106fd6cfc8a"
+                    "GUID": "a6fdfb70-5702-4441-aae4-a4e2668e9a9d"
                   },
                   "ColumnName": "任务状态"
                 },
@@ -95,7 +105,7 @@
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "任务状态",
-                    "GUID": "f1c49b96-cafd-41bb-a773-aed819d56819",
+                    "GUID": "5cc6c7bd-a28e-4a17-919b-95b077220eb0",
                     "RelationBinding": {
                       "RelatedTable": "任务状态",
                       "RelatedColumn": "状态码",
@@ -108,7 +118,7 @@
                   "BindingInfo": {
                     "TableName": "任务表",
                     "ColumnName": "执行者",
-                    "GUID": "b8d6214f-a443-45f7-acf4-f756f3536dea",
+                    "GUID": "a0985b41-d1c6-42fa-89e6-8ed2713b1137",
                     "AttachType": {
                       "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
                       "UserColumnAttachType": 5,
@@ -123,7 +133,7 @@
                 "ColumnBindingInfo": {
                   "TableName": "任务表",
                   "ColumnName": "ID",
-                  "GUID": "c0cdf54c-f3e1-4362-81bc-095932a4f40b"
+                  "GUID": "b1bd5f41-82ac-4f03-8fbd-70fb9d4163ab"
                 },
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -133,7 +143,7 @@
               "NullFormulaValueQueryPolicy": 0,
               "TopCount": "1"
             },
-            "ID": "87a8a1ca8afc42e6b601a540a47b88d5"
+            "ID": "c077cc8306b84173a03c0a6116534769"
           },
           {
             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -158,7 +168,7 @@
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                       "SerializeProperty": "=工时数"
                     },
-                    "ID": "8dc0c955c31047479a6536c2fbd39f6a"
+                    "ID": "55e088f3319448dea371fa65e45574ef"
                   },
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -167,7 +177,7 @@
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                       "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")"
                     },
-                    "ID": "e47382a2af7248b98483985baaa51a32"
+                    "ID": "afa02bcb06164873a38cc14099b5730c"
                   },
                   {
                     "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
@@ -191,7 +201,7 @@
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                               "SerializeProperty": "=开始日期+(index-1)"
                             },
-                            "ID": "834d914107c94850bcaf6300a7318523"
+                            "ID": "d8f653d8f3e743caabfff54e9fa8f8c4"
                           },
                           {
                             "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -220,7 +230,7 @@
                                           "BindingInfo": {
                                             "TableName": "View_任务工时统计",
                                             "ColumnName": "计划工时",
-                                            "GUID": "5ab6d9d2-aba5-4656-a845-e83d1b72a91c"
+                                            "GUID": "706de071-f8e9-46a2-9c01-40ae14c375fc"
                                           },
                                           "ColumnName": "计划工时"
                                         }
@@ -233,7 +243,7 @@
                                             "ColumnBindingInfo": {
                                               "TableName": "View_任务工时统计",
                                               "ColumnName": "任务ID",
-                                              "GUID": "c75276ab-6c2a-46c6-aa4d-474d509de3c5"
+                                              "GUID": "220b4ba7-c4e3-4f52-95ec-5a1a282e1765"
                                             },
                                             "Value": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -245,7 +255,7 @@
                                             "ColumnBindingInfo": {
                                               "TableName": "View_任务工时统计",
                                               "ColumnName": "执行人",
-                                              "GUID": "ebf1b722-31b2-48af-aee4-8456f3aceb01"
+                                              "GUID": "28ce7db3-ff64-4ce7-b1b6-b4b3be6acbe4"
                                             },
                                             "Value": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -257,7 +267,7 @@
                                             "ColumnBindingInfo": {
                                               "TableName": "View_任务工时统计",
                                               "ColumnName": "工时日期",
-                                              "GUID": "05a3349d-83d3-4670-9577-faa2dedcc951"
+                                              "GUID": "3a0cd37f-b1dd-4750-b41d-45d44ff181d7"
                                             },
                                             "Value": {
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -269,7 +279,7 @@
                                       "NullFormulaValueQueryPolicy": 0,
                                       "TopCount": "1"
                                     },
-                                    "ID": "d656dc16830a4ebd9c62865373622d5e"
+                                    "ID": "01839807d75b49669d94ea08af7a40cd"
                                   },
                                   {
                                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -278,7 +288,7 @@
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                       "SerializeProperty": "=IF(index>=分配天数,待分配工时,ROUNDDOWN(工时数/分配天数,1))"
                                     },
-                                    "ID": "5555a281080a4bd3b45369f61f980778"
+                                    "ID": "4f5d9e30584c4ae79cfd818467975213"
                                   },
                                   {
                                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -338,7 +348,7 @@
                                             }
                                           }
                                         ],
-                                        "ID": "0c91b6dc-374c-4f05-b2c9-7a27efc905e9"
+                                        "ID": "98b50752-349a-4f25-b57a-5ce140ac2ce4"
                                       },
                                       {
                                         "CommandList": [
@@ -352,7 +362,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "项目ID",
-                                                  "GUID": "cb331dd7-3590-4815-876c-055ee05dc73a"
+                                                  "GUID": "fd71f2a5-845b-4775-a877-0649e37ba693"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -363,7 +373,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "任务ID",
-                                                  "GUID": "2c498cc8-01d4-420a-a792-b1cc996af78e"
+                                                  "GUID": "05e48271-1a3d-4795-bdd5-cb1c645293ac"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -374,7 +384,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时日期",
-                                                  "GUID": "4fae1347-33a7-4ada-904a-a27efd524b71"
+                                                  "GUID": "6691a7d6-6d9e-4b5d-baf8-49b9124edd82"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -385,7 +395,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时类型",
-                                                  "GUID": "0c4c47f0-ecf3-48c7-85f1-4a5f306b5f59"
+                                                  "GUID": "21286054-452a-4a3b-aea7-994254804b38"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -396,7 +406,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "执行人",
-                                                  "GUID": "6608888f-6f1a-4551-a084-6daa5803005d"
+                                                  "GUID": "7c4c1809-a688-4564-b5c7-3fcb4083324f"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -407,7 +417,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "执行内容",
-                                                  "GUID": "b824dc5e-e940-4a84-b47d-7c29ecf47382"
+                                                  "GUID": "92d5bc0e-8bb8-4a90-a896-c8dcf5c37edc"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -418,7 +428,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时",
-                                                  "GUID": "9a43a905-e60e-45a3-b46c-256d04d33236"
+                                                  "GUID": "429a69c0-101e-411c-b38e-854c0adf2657"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -428,12 +438,12 @@
                                             ]
                                           }
                                         ],
-                                        "ID": "a27646cc-5b6a-4ed0-989a-e89d20560650"
+                                        "ID": "ac35628d-4bd0-4163-905e-a627bdd70880"
                                       }
                                     ]
                                   }
                                 ],
-                                "ID": "caa7447f-18f4-4b64-b07c-930f7b8a8980"
+                                "ID": "5f045248-1e2c-4eb1-b457-bd29b481c4b0"
                               }
                             ]
                           }
@@ -447,7 +457,7 @@
                     "Message": "提交工时成功"
                   }
                 ],
-                "ID": "999a42e2-8f3b-4e6b-94d4-5b9471630f27"
+                "ID": "53b4c905-c899-4ff9-bcf9-99a3a4fb830e"
               },
               {
                 "CommandList": [
@@ -460,7 +470,7 @@
                     }
                   }
                 ],
-                "ID": "3bac0ed8-af90-447b-af27-0f7faf151ec7"
+                "ID": "8a07858b-3d0d-40f4-8514-d8915cf1cf0e"
               }
             ]
           }
diff --git a/Tables/项目任务/子任务视图.json b/Tables/项目任务/子任务视图.json
deleted file mode 100644
index bbf24925..00000000
--- a/Tables/项目任务/子任务视图.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
-  "Name": "子任务视图",
-  "Columns": [
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "ID",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "FGC_Creator",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Double",
-      "MaxLength": -1,
-      "Name": "FGC_CreateDate",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "FGC_LastModifier",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Double",
-      "MaxLength": -1,
-      "Name": "FGC_LastModifyDate",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "项目ID",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "任务名称",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "执行者",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "参与者",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Double",
-      "MaxLength": -1,
-      "Name": "开始时间",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Double",
-      "MaxLength": -1,
-      "Name": "结束时间",
-      "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "任务类型",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "版本",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "任务说明",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "备注",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "父任务ID",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "任务状态",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "分组ID",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.Int64",
-      "MaxLength": -1,
-      "Name": "工时核定方式",
-      "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    },
-    {
-      "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
-      "DatabaseColumnType": "System.String",
-      "MaxLength": -1,
-      "Name": "关联资源",
-      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
-    }
-  ],
-  "BuiltInViewInfo": {
-    "ViewName": "子任务视图",
-    "SourceViewName": "fgc2069855399514a36a1a234dda58",
-    "CreateViewSql": "SELECT * FROM \"任务表\"\r\nWHERE \"父任务ID\" is not NULL"
-  },
-  "PrimaryKey": [
-    "ID"
-  ],
-  "Indexes": [],
-  "Relations": [
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "项目表",
-      "PrimaryColumn": "ID",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "项目ID",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    },
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "任务版本",
-      "PrimaryColumn": "ID",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "版本",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    },
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "任务表",
-      "PrimaryColumn": "ID",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "父任务ID",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    },
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "任务状态",
-      "PrimaryColumn": "状态码",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "任务状态",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    },
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "任务分组",
-      "PrimaryColumn": "ID",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "分组ID",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    },
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "工时核定方式",
-      "PrimaryColumn": "ID",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "工时核定方式",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    },
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "任务类型",
-      "PrimaryColumn": "ID",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "任务类型",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    },
-    {
-      "PrimarySchema": null,
-      "PrimaryTable": "用户信息视图",
-      "PrimaryColumn": "用户名",
-      "ForeignSchema": null,
-      "ForeignTable": "子任务视图",
-      "ForeignColumn": "执行者",
-      "RelationTypeOnDelete": 0,
-      "RelationTypeOnUpdate": 0,
-      "IsDetailTableRelation": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/UserControlPages/工时记录列表.json b/UserControlPages/工时记录列表.json
index 7ccf1437..168e92d3 100644
--- a/UserControlPages/工时记录列表.json
+++ b/UserControlPages/工时记录列表.json
@@ -298,8 +298,8 @@
       "Formula": "工时记录列表!$B$6"
     },
     {
-      "Name": "任务ID",
+      "Name": "属性任务ID",
       "Formula": "工时记录列表!$E$6"
     }
   ]
-}//g9T5nB7u0SQpcbbg304jS9duNRl2rg5IxQ1iyD4tZbSbMWld7j2QtwmzuomJGLFw8U8awP6Gl86qp5mGD5hykDo2tvX37Uk8J0+jx77RnP+OEzOJ+YdSUD2mxKpyfhL6Ew4XyHasFVF/+HhIJh6y1V4VrUr/rVBE6pUwMF6mVtolRUn3PL10vU7Rx7x5UWiYxMFv6OVFRPe5brQDyJ7Y+XOSzNRV26QTFs6XKfYTWilB8lLvoZ6NnEvdnt0ys7oK3vq5cEU1Yo8NcSnOtBwsx2Ga/geuisZu/GP1ocdog/PFxJ3eShq8CcMJQCYIgISAm8jsp5wGpFp2Lwt6B+gbD2J6+kWK8lS5alsSEIhoclMDNZIVOhzSjeImSNMB/C3zFiXEo+/btPnlNuTC0h8kiJV2RWRMyNk5HYZSMrnEf4wHldofZpel8ZBDPlPkRne8hrTsv6+tmnBkHDSZW/xK8Qdy+V+dFyp2PE/lvG4scDJ5vm3VMls5K/8GZLb2LxaLsFcx4Lf3qErsoX7u1P0DmWVovJqqjtAZeTASFGRe8o0VD3ANNVbY8G3r5aFsk1GrFTob88K0IjStkWPwnCCQifIfvlG4rFG19FQc6fuFcTFsF/NpRhHSEfKdzdnZaz0PFjNt9iCv8idFuIqVcm6FTkyancq3pgL+h7OlOjnmiDCH+1+G71RL9F8QLbBRnxalWofeFgYkFx4sb2FKoEvuqpRbDroGfk5H3Y7jWqxhQMtSAM3lQUzGPY1fRNOuOp6S9jJM+jonMuftpd9jKt1J/kEqm/JJbCAIE7oDwkeLmo77CQJMmxRdHr77ZJYlb0a+N23+LHD8hZLTow2f6t+8pV3Zt5EgDayYcGN4MYEKtEpLuzzNlU7wz07wPjU9bESp+On1pzZ99MyP2lW33LeQQA==|920
\ No newline at end of file
+}//dcrT93P0Vq3dnRpeXPXnD3qRuQ/Wo3vB7h/kRNi1luoBpiVX+b2FOdFUlnvhZlfnJ1Dn+b5kTbl+L897hqDb04oxy5uTuFkXI2UK2jYi8RvWgRJ75S0fDaFiaRpf4xQ7C2WZ2hUsn7vgbkqbfUkTElP3w5FTOObpSkb7pw+j5V7B8qLqV7eGpqSioHiWTtlO4Y2yvd9vqRbhcMPC7EsZSUd58w1/Y7Afgma1awOZJmvEoWOQsJjsoksuI1gYqtZG1D0Y7A6NZvAQ/4MTLj7xM9o3IAd4t+xr0XRhDsk/q3kCwngEdIsVrKeJ6CJ73J0iQCFTSEHotvA+iYzp8KJFDo/07O6RnYf59xJM57oXX3plDN9jYNXzFrJm92x7Dg+psgDwthxH2s/73YLdeg4DxIV4hRODnyQFl50V46jlK1Q73gISkqHqvrjlp68UJouulUVRFWaDzrPn3QjIPVJfp2WJSUMdsw4JTZ9ng8b0jNgQ9+hk+brpdE144kBmaMyKErWsL4ecY8WR0wHvzWRIp6SfWESXj2JTH+rWKmck8WeKQbBmXQZYIo5nh3QjIw8um/c/rLEeKEfdtHZSgThUHl+CHHIMxD8QhKZG7oHsU4qgt4CTJ9q0mZS/yBAsmzurC7C/mR6GzpX67RCFOHRbOvIH7+qf2vdxuX7MunAzSbDv5psy27Zwsj0VGlMd2jgPMeDtTcmWWlkWNFc7gpEXXG9QIfPFj9ITcs43d3TD2Q03WGZWgECedvMmK/WMHX8LMc+X0fo2ZDt+eBDCBDJniwi56ZlMdNL0YUtJmNc9WOKW9D2vaFBAYblGcY7PgHN5ZdR/upW7asWLRf8gYN/yNgmd/Jjjnj9NM1HRZqLrJ2YWQ2ZsqMFG0T/z0xEfBkwXC0YkT5oFcSsW+19V7/dI+w==|920
\ No newline at end of file