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/ComActIntegralUserChangeDO.java

@@ -1,13 +1,13 @@
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.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
@@ -174,37 +174,21 @@

    @Override
    public String toString() {
        return "ComActIntegralUserChangeDO{" +
                "id=" + id +
                ", userId=" + userId +
                ", integralId=" + integralId +
                ", communityId=" + communityId +
                ", integralSumTop=" + integralSumTop +
                ", integralSumBack=" + integralSumBack +
                ", integralAvailableSumTop=" + integralAvailableSumTop +
                ", integralAvailableSumBack=" + integralAvailableSumBack +
                ", integralFrozenSumTop=" + integralFrozenSumTop +
                ", integralFrozenSumBack=" + integralFrozenSumBack +
                ", integralPartyTop=" + integralPartyTop +
                ", integralPartyBack=" + integralPartyBack +
                ", integralAvailablePartyTop=" + integralAvailablePartyTop +
                ", integralAvailablePartyBack=" + integralAvailablePartyBack +
                ", integralFrozenPartyTop=" + integralFrozenPartyTop +
                ", integralFrozenPartyBack=" + integralFrozenPartyBack +
                ", integralVolunteerTop=" + integralVolunteerTop +
                ", integralVolunteerBack=" + integralVolunteerBack +
                ", integralAvailableVolunteerTop=" + integralAvailableVolunteerTop +
                ", integralAvailableVolunteerBack=" + integralAvailableVolunteerBack +
                ", integralFrozenVolunteerTop=" + integralFrozenVolunteerTop +
                ", integralFrozenVolunteerBack=" + integralFrozenVolunteerBack +
                ", integralResidentTop=" + integralResidentTop +
                ", integralResidentBack=" + integralResidentBack +
                ", integralAvailableResidentTop=" + integralAvailableResidentTop +
                ", integralAvailableResidentBack=" + integralAvailableResidentBack +
                ", integralFrozenResidentTop=" + integralFrozenResidentTop +
                ", integralFrozenResidentBack=" + integralFrozenResidentBack +
                ", serviceId=" + serviceId +
                ", createAt=" + createAt +
                "}";
        return "ComActIntegralUserChangeDO{" + "id=" + id + ", userId=" + userId + ", integralId=" + integralId
            + ", communityId=" + communityId + ", integralSumTop=" + integralSumTop + ", integralSumBack="
            + integralSumBack + ", integralAvailableSumTop=" + integralAvailableSumTop + ", integralAvailableSumBack="
            + integralAvailableSumBack + ", integralFrozenSumTop=" + integralFrozenSumTop + ", integralFrozenSumBack="
            + integralFrozenSumBack + ", integralPartyTop=" + integralPartyTop + ", integralPartyBack="
            + integralPartyBack + ", integralAvailablePartyTop=" + integralAvailablePartyTop
            + ", integralAvailablePartyBack=" + integralAvailablePartyBack + ", integralFrozenPartyTop="
            + integralFrozenPartyTop + ", integralFrozenPartyBack=" + integralFrozenPartyBack
            + ", integralVolunteerTop=" + integralVolunteerTop + ", integralVolunteerBack=" + integralVolunteerBack
            + ", integralAvailableVolunteerTop=" + integralAvailableVolunteerTop + ", integralAvailableVolunteerBack="
            + integralAvailableVolunteerBack + ", integralFrozenVolunteerTop=" + integralFrozenVolunteerTop
            + ", integralFrozenVolunteerBack=" + integralFrozenVolunteerBack + ", integralResidentTop="
            + integralResidentTop + ", integralResidentBack=" + integralResidentBack + ", integralAvailableResidentTop="
            + integralAvailableResidentTop + ", integralAvailableResidentBack=" + integralAvailableResidentBack
            + ", integralFrozenResidentTop=" + integralFrozenResidentTop + ", integralFrozenResidentBack="
            + integralFrozenResidentBack + ", serviceId=" + serviceId + ", createAt=" + createAt + "}";
    }
}