From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java
index 695e6b2..d3ab61b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java
@@ -74,6 +74,11 @@
     private BigDecimal ordinaryReward;
 
     /**
+     * 一般奖励金额
+     */
+    private BigDecimal commonlyReward;
+
+    /**
      * 随手拍数量
      */
     private Integer count;
@@ -87,6 +92,16 @@
      */
     private String logo;
 
+    /**
+     * 活动状态(1.待开始 2.进行中 3.已结束  4.已取消)
+     */
+    public interface status{
+        int dks = 1;
+        int jxz = 2;
+        int yjs = 3;
+        int yqx = 4;
+    }
+
     @Override
     public String toString() {
         return "ComActEasyPhotoActivityDO{" +

--
Gitblit v1.7.1