From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/resources/application.yml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cd5a48f..075e5e1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phyzasrs
+ #url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
- path: /stock/out/@pom.build.finalName@/logs
+ path: stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
--
Gitblit v1.9.1