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/ComActEasyPhotoRewardDO.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
@@ -58,24 +58,17 @@
     */
    private Date updateAt;

    @Override
    public String toString() {
        return "ComActEasyPhotoRewardDO{" + "id=" + id + ", userId=" + userId + ", communityId=" + communityId
            + ", isRead=" + isRead + ", amount=" + amount + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
    }

    /**
     * 是否已读（1.是 2.否）
     */
    public interface isRead{
    public interface isRead {
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComActEasyPhotoRewardDO{" +
                "id=" + id +
                ", userId=" + userId +
                ", communityId=" + communityId +
                ", isRead=" + isRead +
                ", amount=" + amount +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}