From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/db/DBUtil.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/db/DBUtil.java b/gx_tieta/src/com/fgkj/db/DBUtil.java
index 8ebd76d..4195765 100644
--- a/gx_tieta/src/com/fgkj/db/DBUtil.java
+++ b/gx_tieta/src/com/fgkj/db/DBUtil.java
@@ -19,9 +19,9 @@
 	private static String username="root";
 	private static String password="lmx8688139";
 	//private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
-	//private static String url="jdbc:mysql://123.207.82.239:3360/db_user";
+	private static String url="jdbc:mysql://123.207.82.239:3360/db_user";
 	//private static String url="jdbc:mysql://192.168.0.34:3360/db_user";
-    private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
+    //private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
 	/*private static String username="root";
 	private static String password="123456";*/
 	

--
Gitblit v1.9.1