From 0c13eb833bb1f2c27cb825169aac24e52db7c1f7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 01 三月 2022 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
index d6716e7..f3b69e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -36,7 +36,7 @@
     private String happenAddr;
 
     /**
-     * 状态 1待审核 2进行中 3已驳回 4已完成
+     * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
      */
     private Integer status;
 
@@ -180,6 +180,10 @@
      * 单张图片高度
      */
     private BigDecimal imgHeight;
+    /**
+     * 评价时间
+     */
+    private Date evaluateDate;
 
     /**
      * 参加活动标签(1.优质 2.精良 3.普通 4.一般)
@@ -193,12 +197,13 @@
     }
 
     /**
-     * 状态 1待审核 2进行中 3已驳回 4已完成
+     * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
      */
     public interface status {
         int dsh = 1;
         int dfk = 2;
         int ybh = 3;
-        int ywc = 4;
+        int dpj = 4;
+        int ywc = 5;
     }
 }

--
Gitblit v1.7.1