diff --git a/.gitignore b/.gitignore
index a6163934..6a8f8e2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ public.sql
 发版记录/2025-11-12/~$S-管理系统-调价管理.docx
 发版记录/2025-11-12/发版日志.docx
 .gitignore
+openhis-server-new/openhis-application/src/main/resources/application-dev.yml
diff --git a/openhis-server-new/openhis-application/pom.xml b/openhis-server-new/openhis-application/pom.xml
index e9fe8bbf..616f682d 100644
--- a/openhis-server-new/openhis-application/pom.xml
+++ b/openhis-server-new/openhis-application/pom.xml
@@ -66,17 +66,10 @@
             <artifactId>httpclient</artifactId>
         </dependency>
         <!-- rabbitMQ -->
-<<<<<<< HEAD
         <!-- <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency> -->
-=======
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
->>>>>>> v1.3
 
     </dependencies>
 
diff --git a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml b/openhis-server-new/openhis-application/src/main/resources/application-dev.yml
index fe94317c..500e9758 100644
--- a/openhis-server-new/openhis-application/src/main/resources/application-dev.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://47.116.196.11:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
         password: Jchl1528
       # 从库数据源
@@ -64,9 +64,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.110.252
+    host: 47.116.196.11
     # 端口，默认为6379
-    port: 6379
+    port: 26379
     # 数据库索引
     database: 1
     # 密码
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
index 194608c9..4bd3bed7 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml
@@ -22,21 +22,6 @@
 
     <!-- 根据区域id数组查询 区域表 -->
     <select id="searchLocationDataByBusNo" resultType="com.openhis.administration.dto.PatientBedInfoDto">
-<<<<<<< HEAD
-        select id        as bedLocationId,
-        bus_no           as busNo,
-        name             as bedName,
-        status_enum      as statusEnum,
-        mode_enum        as modeEnum,
-        operational_enum as operationalEnum
-        from adm_location
-        where delete_flag = '0'
-           and bus_no like concat (#{busNo}, '%') and form_enum = #{formEnum} and status_enum = #{statusEnum}
-    </select>
-
-
-
-=======
         select id               as bedLocationId,
                bus_no           as busNo,
                name             as bedName,
@@ -64,5 +49,4 @@
     </select>
 
 
->>>>>>> v1.3
 </mapper>
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
index 9648f46a..c713d7a4 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
@@ -44,11 +44,7 @@
     </select>
     <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
     <select id="searchMedListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
-<<<<<<< HEAD
-        select med.id as targetId, med_def.name as name, med.total_volume as volume, details.amount as
-=======
         select med_def.id as targetId, med_def.name as name, med.total_volume as volume, details.amount as
->>>>>>> v1.3
         originRetailPrice,def_details.amount as originBuyingPrice,med_def.bus_no as busNo,med_def.min_unit_code as unitCode
         from med_medication med
         inner join med_medication_definition med_def on med.medication_def_id = med_def.id
diff --git a/openhis-ui-vue3/index.html b/openhis-ui-vue3/index.html
index 0eb85e60..8c84232c 100644
--- a/openhis-ui-vue3/index.html
+++ b/openhis-ui-vue3/index.html
@@ -5,7 +5,6 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="renderer" content="webkit" />
-<<<<<<< HEAD
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     
     <!-- SEO 和描述信息 -->
@@ -36,14 +35,6 @@
     <link rel="icon" href="/favicon/favicon.svg" type="image/svg+xml">
     <!-- 打印样式按需加载 -->
     <link rel="stylesheet" type="text/css" media="print" href="/print-lock.css" onload="this.media='all'">
-=======
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
-    />
-    <link rel="icon" href="src/assets/images/ccu.png" />
-    <link rel="stylesheet" type="text/css" media="print" href="/public/print-lock.css" />
->>>>>>> v1.3
     <title>医院信息管理系统</title>
     <!--[if lt IE 11]>
       <script>