From 04bc2d9b97c61ea79017d05f81053e719742f82f Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:41:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/Battinf_apply.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dto/Battinf_apply.java b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
index acc61b7..25bf2dc 100644
--- a/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
+++ b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
@@ -6,7 +6,9 @@
public class Battinf_apply implements Serializable{
private int num;
private int apply_uid;
+ private String apply_name;
private int confrim_uid;
+ private String confirm_name;
private Date apply_date;
private int apply_en;
private String apply_note;
@@ -53,12 +55,27 @@
public void setBinf(BattInf binf) {
this.binf = binf;
}
+
+ public String getApply_name() {
+ return apply_name;
+ }
+ public void setApply_name(String apply_name) {
+ this.apply_name = apply_name;
+ }
+ public String getConfirm_name() {
+ return confirm_name;
+ }
+ public void setConfirm_name(String confirm_name) {
+ this.confirm_name = confirm_name;
+ }
@Override
public String toString() {
return "Battinf_apply [num=" + num + ", apply_uid=" + apply_uid
- + ", confrim_uid=" + confrim_uid + ", apply_date=" + apply_date
- + ", apply_en=" + apply_en + ", apply_note=" + apply_note
- + ", binf=" + binf + "]";
+ + ", 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 + "]";
}
+
}
--
Gitblit v1.9.1