From a220fe323e37523f76996b0eb91ca55f1f7af5ce Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 12 十月 2018 14:04:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattInf.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 5c8b7fb..b407550 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -73,7 +73,7 @@
private String SignalName;
private Integer StartNum;
private Integer Size;
-
+ private Page page;
private Object obj;
public BattInf() {
super();
@@ -496,6 +496,13 @@
public void setObj(Object obj) {
this.obj = obj;
}
+
+ public Page getPage() {
+ return page;
+ }
+ public void setPage(Page page) {
+ this.page = page;
+ }
@Override
public String toString() {
return "BattInf [num=" + num + ", StationId=" + StationId
--
Gitblit v1.9.1