From 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 05 十一月 2021 10:57:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/pda/index.html | 4 ++--
src/main/resources/application.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9c77647..a5abf76 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,8 +45,8 @@
erp:
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# ur: jdbc:sqlserver://192.168.0.253:1433;databasename=xtyasrs_dual
- ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
+ ur: jdbc:sqlserver://192.168.0.253:1433;databasename=xtyasrs_dual
+# ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
username: sa
password: sa@123
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 9fa1701..8199ff8 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -154,8 +154,8 @@
} else if (res.data.code === 'b') {
$("#locNormalIn1").parent().hide();
$("#locNormalOut1").parent().hide();
- $("#locNormalIn").parent().hide();
- $("#locNormalOut").parent().hide();
+ // $("#locNormalIn").parent().hide();
+ // $("#locNormalOut").parent().hide();
} else if (res.data.code === 'c') {
$("#combAgv").parent().hide();
$("#combProAgv").parent().hide();
--
Gitblit v1.9.1