From 12e9ba156bb74248258e78e4a6ecaf89518010b6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 28 十一月 2018 16:44:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/BattInfAction.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 8520b5f..947b4f5 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -399,7 +399,20 @@
 		result = ActionUtil.tojson(model);
 		return SUCCESS;
 	}
-	
+	//澶撮儴鏌ュ嚭宸插畨瑁呯殑鎵�鏈夋満鎴�
+	public String serchByDeviceId(){
+		User_inf uinf=(User_inf) getUser();
+		ServiceModel model = service.serchByDeviceId(uinf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
+	//澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+	public String serchByInstall_count(){
+		User_inf uinf=(User_inf) getUser();
+		ServiceModel model = service.serchByInstall_count(uinf);
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+	}
 	public BattInf getBif() {
 		return bif;
 	}

--
Gitblit v1.9.1