From cd1fdec5fc60198780ed239779052bf6954427ea Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 08 九月 2025 21:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycawdasrs-2' into ycawdasrs-2

---
 src/main/resources/application.yml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1bb95db..5baf1a6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -26,6 +26,16 @@
       maxFileSize: 100MB
       maxRequestSize: 100MB
 
+other:
+  datasource:
+    #    jdbc-url: jdbc:mysql://127.0.0.1:3306/wmsdata
+    #    username: root
+    #    password: root
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
+    username: liku
+    password: 123456
+
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml 
 #  global-config:

--
Gitblit v1.9.1