From 7cacc9eb3f246fa46e94c0f557fd6f4e1a07bb94 Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期三, 26 五月 2021 17:43:25 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index a24cb6d..b3e79bb 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -69,7 +69,7 @@
         }
 
         /// <summary>
-        /// 濮斿宸ュ簭鍙戝嚭鍗曟祦姘村彿鍥炶溅鑾峰彇娴佽浆鍗′俊鎭�
+        /// 濮斿宸ュ簭鍙戝嚭鍗曟祦姘村彿鍥炶溅鑾峰彇娴佽浆鍗′俊鎭紙濮斿宸ュ簭鎺ユ敹銆佸伐搴忚繘绔欐帴鏀堕�氱敤锛�
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>

--
Gitblit v1.9.1