From fd77d548a62649faabcecd1c33352aa28cf8fead Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 12:03:30 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dto/BattInf.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index dc93b0e..740863e 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -85,6 +85,7 @@
 	
 	private Battinf_ex binf_ex;
 	
+	private String VideoOrImage ;//涓婁紶鏂囦欢鐨勬牸寮�
 	public BattInf() {
 		super();
 	}
@@ -552,6 +553,13 @@
 	public void setInstall_user(String install_user) {
 		this.install_user = install_user;
 	}
+	
+	public String getVideoOrImage() {
+		return VideoOrImage;
+	}
+	public void setVideoOrImage(String videoOrImage) {
+		VideoOrImage = videoOrImage;
+	}
 	@Override
 	public String toString() {
 		return "BattInf [num=" + num + ", StationId=" + StationId

--
Gitblit v1.9.1