From bd0ac05436fa6195aac2bcc41381a9c154d2990b Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 28 五月 2021 18:18:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java
index fd1993e..43e951a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/ComActEasyPhotoDO.java
@@ -42,7 +42,7 @@
      */
     private String addrRemark;
     /**
-     * 状态 1待处理 2已处理   列: status
+     * 状态 1待审核   2进行中 3已驳回 4已完成  列: status
      */
     private Integer status;
     /**
@@ -95,10 +95,6 @@
      */
     private String rejectReason;
     /**
-     * 封面图片   列: cover
-     */
-    private String cover;
-    /**
      * 是否删除 0 否 1 是   列: del_tag
      */
     private Integer delTag;
@@ -110,4 +106,22 @@
      * 是否公示(0.否 1.是)   列: is_publicity
      */
     private Integer isPublicity;
+    /**
+     * 处理状态(1.待处理 2.已处理)
+     */
+    private Integer handleStatus;
+    /**
+     * 处理状态(1.待处理 2.已处理)
+     */
+    public interface handleStatus{
+        int no = 1;
+        int yes = 2;
+    }
+    /**
+     * 是否上报社区处理(0.否 1.是)
+     */
+    public interface isReport{
+        int no = 0;
+        int yes = 1;
+    }
 }
\ No newline at end of file

--
Gitblit v1.7.1