From 437ba064da76646c9b285f8e8c7f1d4663c881ee Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Wed, 17 Aug 2022 09:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=A1=88=E5=AE=A4=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E5=88=AB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/Archive_MasterMapper.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index ad3769ce..84b8ecb0 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -112,14 +112,7 @@
         <result column="overTime2" jdbcType="INTEGER" property="overTime2" />
         <result column="flag" jdbcType="INTEGER" property="flag" />
         <result column="countNum" jdbcType="INTEGER" property="countNum" />
-<<<<<<< HEAD
         <result column="handleTimeMax1" jdbcType="NVARCHAR" property="handleTimeMax1"/>
-
-=======
-        <result column="C1" jdbcType="NVARCHAR" property="C1" />
-        <result column="C9" jdbcType="NVARCHAR" property="C9" />
-        <result column="T3" jdbcType="NVARCHAR" property="T3" />
->>>>>>> origin/master
     </resultMap>
     <sql id="Base_Column_List">
     id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,