From 149c4ca0c7d1222a355245e43474ba476b285503 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 12 五月 2022 11:52:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 1 +
src/main/resources/application.yml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 28708d3..10a2f99 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -205,6 +205,7 @@
if (Utils.isShallowLoc(slaveProperties, curRow)) {
Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
+ // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭ｄ箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (!locMastService.checkEmptyCount(locMast)) {
locMast = null;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ad49c93..76891b5 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://localhost:1433;databasename=jkasrs
-# url: jdbc:sqlserver://10.10.0.200:1433;databasename=jkasrs
+# url: jdbc:sqlserver://localhost:1433;databasename=jkasrs
+ url: jdbc:sqlserver://10.10.0.201:1433;databasename=jkasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1