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

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

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
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.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

/**
 * @description: 便民服务列表
@@ -66,11 +67,9 @@
    private Date createAt;

    public boolean equals(ComCvtServeDO obj) {
        return obj.getBusinessId() == this.getBusinessId()
                && obj.getCategoryId() == this.getCategoryId()
                && obj.getServiceName().equals(this.getServiceName())
                && obj.getServicePrice().compareTo(this.getServicePrice()) == 0
                && obj.getServiceDesc().equals(this.getServiceDesc())
                ;
        return obj.getBusinessId() == this.getBusinessId() && obj.getCategoryId() == this.getCategoryId()
            && obj.getServiceName().equals(this.getServiceName())
            && obj.getServicePrice().compareTo(this.getServicePrice()) == 0
            && obj.getServiceDesc().equals(this.getServiceDesc());
    }
}