From 1f41ce879673809b9df672ac7ba6fc46bf50a7fb Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 5 Dec 2024 18:27:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=A7=E7=94=B0=E5=8E=BF=E5=8C=BB?=
 =?UTF-8?q?=E9=99=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 9 +++++++++
 src/main/resources/application-pro.yml                   | 5 -----
 .../mapper/other/dtxyy/DeviceBusinessProjectMapper.xml   | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ee875e..1a0b207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,15 @@
             <version>19.18.0.0</version>
             <scope>runtime</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>6.1.0.jre8</version>
+            <scope>runtime</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>cn.easyproject</groupId>
             <artifactId>orai18n</artifactId>
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 6c8b862..952bb89 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -9,11 +9,6 @@ spring:
           username: root
           password: Glxp@6066
           driver-class-name: com.mysql.cj.jdbc.Driver
-        njsql:
-          url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          username: root
-          password: Glxp@6066
-          driver-class-name: com.mysql.cj.jdbc.Driver
         ptxhSql:
           url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
diff --git a/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml
index 5eacba3..220f91d 100644
--- a/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.glxp.mipsdl.thirddao.dtxyy.DeviceBusinessProjectMapper">
 
    <select id="selectList" resultType="com.glxp.mipsdl.client.ptxhyy.entity.DeviceBusinessProject">
-        select rq AS chargTime,sfxm,sfmc,je.sfmz
+        select rq AS chargTime,sfxm,sfmc,je,sfmz
         from udi_sbfybb
         <where>
             <if test="sfxm != null and sfxm != ''">