From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
index 45d92bb..cddb552 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
@@ -122,7 +122,7 @@
}
//鎵归噺璁剧疆绯荤粺鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯绯荤粺鍙傛暟
public ServiceModel serchBattinfAndParam(Object obj) {
- List<BattInf> list=(new BattInfImpl()).serchByBatt_param(obj);
+ List<BattInf> list=(new BattInfImpl()).serchBySys_param(obj);
if(list!=null&&list.size()>0) {
Calendar c = Calendar.getInstance();
//鐜板湪鐨勬椂闂�(鍗曚綅锛氭绉�)
@@ -202,7 +202,7 @@
ServiceModel model=fs.serchBattinfAndParam(binf);
List list=(List)model.getData();
for (int i = 0; i < list.size(); i++) {
- System.out.println(((BattInf)list.get(i)).getObj());
+ System.out.println(((BattInf)list.get(i)));
}
}
}
--
Gitblit v1.9.1