Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java

@@ -1,14 +1,14 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

/**
 * @auther lyq
@@ -34,7 +34,7 @@
    private Long communityId;

    /**
     * 活动状态（1.待开始 2.进行中 3.已结束  4.已取消）
     * 活动状态（1.待开始 2.进行中 3.已结束 4.已取消）
     */
    private Integer status;

@@ -92,30 +92,21 @@
     */
    private String logo;

    @Override
    public String toString() {
        return "ComActEasyPhotoActivityDO{" + "id=" + id + ", status=" + status + ", content=" + content
            + ", activityStartAt=" + activityStartAt + ", activityEntAt=" + activityEndAt + ", releaseAt=" + releaseAt
            + ", goodReward=" + goodReward + ", excellentReward=" + excellentReward + ", ordinaryReward="
            + ordinaryReward + ", count=" + count + ", createAt=" + createAt + "}";
    }

    /**
     * 活动状态（1.待开始 2.进行中 3.已结束  4.已取消）
     * 活动状态（1.待开始 2.进行中 3.已结束 4.已取消）
     */
    public interface status{
    public interface status {
        int dks = 1;
        int jxz = 2;
        int yjs = 3;
        int yqx = 4;
    }

    @Override
    public String toString() {
        return "ComActEasyPhotoActivityDO{" +
                "id=" + id +
                ", status=" + status +
                ", content=" + content +
                ", activityStartAt=" + activityStartAt +
                ", activityEntAt=" + activityEndAt +
                ", releaseAt=" + releaseAt +
                ", goodReward=" + goodReward +
                ", excellentReward=" + excellentReward +
                ", ordinaryReward=" + ordinaryReward +
                ", count=" + count +
                ", createAt=" + createAt +
                "}";
    }
}