From bc517b90731dfc34b8aee0d7f4877d96b09c18da Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 03 十一月 2020 09:06:03 +0800
Subject: [PATCH] Merge branch 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 63b7175..1bb177f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,7 @@
     #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
     #username: sa
     #password: eisoft
-    url: jdbc:sqlserver://localhost:1433;databasename=jsasrs
+    url: jdbc:sqlserver://192.168.2.250:1433;databasename=jsasrs
     username: sa
     password: sa@123
   mvc:
@@ -62,6 +62,15 @@
       row: 1
       bay: 0
       lev: 1
+    # 鍫嗗灈鏈�2
+    crn[1]:
+      id: 1
+      ip: 192.168.6.10
+      port: 102
+      rack: 0
+      slot: 0
+      # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+      offset: 2
   # 杈撻�佺嚎
   devp[0]:
     id: 1

--
Gitblit v1.9.1