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

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

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

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

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @auther lyq
@@ -76,12 +76,12 @@
    private String detailAddress;

    /**
     * 是否是默认地址(1.是  2.否)
     * 是否是默认地址(1.是 2.否)
     */
    private Integer isDefault;

    /**
     * 是否已删除（1.是  2.否）
     * 是否已删除（1.是 2.否）
     */
    private Integer deleteStatus;

@@ -99,28 +99,17 @@

    @Override
    public String toString() {
        return "ComShopUserAddressDO{" +
                "id=" + id +
                ", userId=" + userId +
                ", name=" + name +
                ", phone=" + phone +
                ", provinceCode=" + provinceCode +
                ", provinceName=" + provinceName +
                ", cityCode=" + cityCode +
                ", cityName=" + cityName +
                ", districtCode=" + districtCode +
                ", districtName=" + districtName +
                ", detailAddress=" + detailAddress +
                ", isDefault=" + isDefault +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
        return "ComShopUserAddressDO{" + "id=" + id + ", userId=" + userId + ", name=" + name + ", phone=" + phone
            + ", provinceCode=" + provinceCode + ", provinceName=" + provinceName + ", cityCode=" + cityCode
            + ", cityName=" + cityName + ", districtCode=" + districtCode + ", districtName=" + districtName
            + ", detailAddress=" + detailAddress + ", isDefault=" + isDefault + ", createAt=" + createAt + ", updateAt="
            + updateAt + "}";
    }

    /**
     * 是否是默认地址(1.是  2.否)
     * 是否是默认地址(1.是 2.否)
     */
    public interface isDefault{
    public interface isDefault {
        int yes = 1;
        int no = 2;
    }