From 82c1e7ced425f43781b0cd01290fad298f51e623 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 六月 2019 13:27:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw
---
sensor/src/com/fgkj/actions/LoginAction.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sensor/src/com/fgkj/actions/LoginAction.java b/sensor/src/com/fgkj/actions/LoginAction.java
index 90e25d3..c427f74 100644
--- a/sensor/src/com/fgkj/actions/LoginAction.java
+++ b/sensor/src/com/fgkj/actions/LoginAction.java
@@ -13,14 +13,11 @@
import com.fgkj.db.DBUtil;
import com.fgkj.db.IDatabaseName;
import com.fgkj.dto.ServiceModel;
-import com.fgkj.dto.User;
import com.fgkj.dto.UserClient;
import com.fgkj.dto.User_Chart;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.User_log;
-import com.fgkj.services.UserService;
import com.fgkj.services.User_ChartService;
-import com.fgkj.services.User_battgroup_baojigroup_battgroupService;
import com.fgkj.services.User_infService;
import com.fgkj.services.User_logService;
import com.fgkj.services.Vip_userService;
@@ -158,7 +155,7 @@
* 瀛樺偍褰撳墠鐢ㄦ埛鐨勫寘鏈虹粍淇℃伅
* @param u
*/
- public void setUserBaoji(User_inf u){
+ /*public void setUserBaoji(User_inf u){
User_battgroup_baojigroup_battgroupService se = new User_battgroup_baojigroup_battgroupService();
try {
Object batts = se.serchByCondition(u).getData();
@@ -169,7 +166,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }*/
/**
* 璁板綍鐢ㄦ埛鐨勭櫥褰曡褰�
--
Gitblit v1.9.1