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/ComActEasyPhotoActivityRecordDO.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
@@ -70,16 +70,8 @@

    @Override
    public String toString() {
        return "ComActEasyPhotoActivityRecordDO{" +
                "id=" + id +
                ", userId=" + userId +
                ", activityId=" + activityId +
                ", communityId=" + communityId +
                ", easyId=" + easyId +
                ", type=" + type +
                ", rewardAmount=" + rewardAmount +
                ", joinAt=" + joinAt +
                ", createAt=" + createAt +
                "}";
        return "ComActEasyPhotoActivityRecordDO{" + "id=" + id + ", userId=" + userId + ", activityId=" + activityId
            + ", communityId=" + communityId + ", easyId=" + easyId + ", type=" + type + ", rewardAmount="
            + rewardAmount + ", joinAt=" + joinAt + ", createAt=" + createAt + "}";
    }
}