From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
index a969e45..55d807f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
@@ -752,7 +752,7 @@
    
 	//鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑鐢垫睜缁刬d(寰堥噸瑕�**********)
 	public int searchMaxBattgroupId(){
-		String sql=" select max(battgroupId) as id from db_battinf.tb_battinf limit 1";
+		String sql=" select max(battgroupId) as id from db_ram_db.tb_batt_rtstate limit 1";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
 			
 			public List getResults(ResultSet rs) {

--
Gitblit v1.9.1