From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/resources/UpdateThread.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/UpdateThread.cs b/src/main/resources/UpdateThread.cs
index 9789b84..b59cfdb 100644
--- a/src/main/resources/UpdateThread.cs
+++ b/src/main/resources/UpdateThread.cs
@@ -797,7 +797,7 @@
{
switch (li_io_type)
{
- #region 绌烘墭鐩樺叆搴�
+ #region 绌鸿揣鏋跺叆搴�
case 10:
sql = "update asr_loc_mast set loc_sts='D',io_time='" + ldt_date + "',modi_time='" + ldt_date + "'";
sql += " where loc_no='" + ls_loc_no + "' and (loc_sts = 'S' Or loc_sts = 'Q')";
--
Gitblit v1.9.1