From ba927b1faad68ab38d053ee9ea9eeac4b1a5531b Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 08:23:10 +0800
Subject: [PATCH] resolve merge conflicts: keep theirs for all binary files

---
 WebAPI/InvokeHelper.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index e919122..1f188e6 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -247,7 +247,7 @@
         }
 
         /// <summary>
-        /// 闄勪欢涓婁紶
+        /// 闄勪欢涓婁紶 閫傜敤浜� 8.0 浠ヤ笂鐗堟湰
         /// </summary>
         /// <param name="formId"></param>
         /// <param name="content"></param>

--
Gitblit v1.9.1