From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Battinf_apply.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Battinf_apply.java b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
index 25bf2dc..074bef0 100644
--- a/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
+++ b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
@@ -12,7 +12,13 @@
private Date apply_date;
private int apply_en;
private String apply_note;
+ private int check_en;
+ private int check_uid;
+ private String check_uname;
private BattInf binf;
+ private double longitude;
+ private double latitude;
+ private String address;
public int getNum() {
return num;
}
@@ -68,14 +74,52 @@
public void setConfirm_name(String confirm_name) {
this.confirm_name = confirm_name;
}
+ public int getCheck_en() {
+ return check_en;
+ }
+ public void setCheck_en(int check_en) {
+ this.check_en = check_en;
+ }
+ public int getCheck_uid() {
+ return check_uid;
+ }
+ public void setCheck_uid(int check_uid) {
+ this.check_uid = check_uid;
+ }
+ public String getCheck_uname() {
+ return check_uname;
+ }
+ public void setCheck_uname(String check_uname) {
+ this.check_uname = check_uname;
+ }
+ public double getLongitude() {
+ return longitude;
+ }
+ public void setLongitude(double longitude) {
+ this.longitude = longitude;
+ }
+ public double getLatitude() {
+ return latitude;
+ }
+ public void setLatitude(double latitude) {
+ this.latitude = latitude;
+ }
+ public String getAddress() {
+ return address;
+ }
+ public void setAddress(String address) {
+ this.address = address;
+ }
@Override
public String toString() {
- return "Battinf_apply [num=" + num + ", apply_uid=" + apply_uid
- + ", apply_name=" + apply_name + ", confrim_uid=" + confrim_uid
- + ", confirm_name=" + confirm_name + ", apply_date="
- + apply_date + ", apply_en=" + apply_en + ", apply_note="
- + apply_note + ", binf=" + binf + "]";
+ return "Battinf_apply [num=" + num + ", apply_uid=" + apply_uid + ", apply_name=" + apply_name
+ + ", confrim_uid=" + confrim_uid + ", confirm_name=" + confirm_name + ", apply_date=" + apply_date
+ + ", apply_en=" + apply_en + ", apply_note=" + apply_note + ", check_en=" + check_en + ", check_uid="
+ + check_uid + ", check_uname=" + check_uname + ", binf=" + binf + ", longitude=" + longitude
+ + ", latitude=" + latitude + ", address=" + address + "]";
}
+
+
}
--
Gitblit v1.9.1