From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java |  127 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 108 insertions(+), 19 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java b/java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java
old mode 100644
new mode 100755
index 3c6c985..6376af7
--- a/java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java
@@ -15,16 +15,36 @@
  **/
 public class NoticeDto extends PageDto implements Serializable {
 
+    public static final String STATE_WAIT = "1000";// 绛夊緟鎴垮眿
+    public static final String STATE_DOING = "2000";//澶勭悊涓�
+    public static final String STATE_FINISH = "3000";//澶勭悊瀹屾垚
+
+    public static final String OBJ_TYPE_COMMUNITY = "001";//灏忓尯
+    public static final String OBJ_TYPE_FLOOR = "002";//妤兼爧
+    public static final String OBJ_TYPE_UNIT = "003";//鍗曞厓
+    public static final String OBJ_TYPE_ROOM = "004";//鍗曞厓
+    public static final String OBJ_TYPE_ALL = "005";//鍗曞厓
+
+    public static final String NOTICE_TYPE_OWNER_WECHAT = "1003";//鍙戦�佺粰涓氫富寰俊
+
     private String noticeTypeCd;
-private String context;
-private String startTime;
-private String communityId;
-private String title;
-private String userId;
-private String noticeId;
+    private String context;
+    private String startTime;
+    private String endTime;
+    private String communityId;
+    private String title;
+    private String userId;
+    private String noticeId;
+    private String objType;
+    private String objId;
+    private String objName;
+    private String state;
+    private String stateName;
 
 
     private Date createTime;
+
+    private String noticeTypeCdName;
 
     private String statusCd = "0";
 
@@ -32,43 +52,56 @@
     public String getNoticeTypeCd() {
         return noticeTypeCd;
     }
-public void setNoticeTypeCd(String noticeTypeCd) {
+
+    public void setNoticeTypeCd(String noticeTypeCd) {
         this.noticeTypeCd = noticeTypeCd;
     }
-public String getContext() {
+
+    public String getContext() {
         return context;
     }
-public void setContext(String context) {
+
+    public void setContext(String context) {
         this.context = context;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getTitle() {
+
+    public String getTitle() {
         return title;
     }
-public void setTitle(String title) {
+
+    public void setTitle(String title) {
         this.title = title;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getNoticeId() {
+
+    public String getNoticeId() {
         return noticeId;
     }
-public void setNoticeId(String noticeId) {
+
+    public void setNoticeId(String noticeId) {
         this.noticeId = noticeId;
     }
 
@@ -88,4 +121,60 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getNoticeTypeCdName() {
+        return noticeTypeCdName;
+    }
+
+    public void setNoticeTypeCdName(String noticeTypeCdName) {
+        this.noticeTypeCdName = noticeTypeCdName;
+    }
+
+    public String getObjType() {
+        return objType;
+    }
+
+    public void setObjType(String objType) {
+        this.objType = objType;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
 }

--
Gitblit v1.8.0