From 8a15db8b08c70dfd54cc27d78065e08de22d5952 Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期二, 03 十二月 2019 15:13:08 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600
---
platforms/android/app/src/main/java/com/fgkj/dto/Battalram_data.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/platforms/android/app/src/main/java/com/fgkj/dto/Battalram_data.java b/platforms/android/app/src/main/java/com/fgkj/dto/Battalram_data.java
index 8590c91..628d72e 100644
--- a/platforms/android/app/src/main/java/com/fgkj/dto/Battalram_data.java
+++ b/platforms/android/app/src/main/java/com/fgkj/dto/Battalram_data.java
@@ -15,6 +15,7 @@
private int alm_is_confirmed;
private Date alm_confirmed_time;
private int alm_cleared_type;
+ private String note;
private Page page;
public int getNum() {
@@ -113,6 +114,14 @@
this.page = page;
}
+ public String getNote() {
+ return note;
+ }
+
+ public void setNote(String note) {
+ this.note = note;
+ }
+
@Override
public String toString() {
return "Battalram_data{" +
@@ -127,6 +136,7 @@
", alm_is_confirmed=" + alm_is_confirmed +
", alm_confirmed_time=" + alm_confirmed_time +
", alm_cleared_type=" + alm_cleared_type +
+ ", note='" + note + '\'' +
", page=" + page +
'}';
}
--
Gitblit v1.9.1