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

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

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

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

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @auther lyq
@@ -122,6 +122,15 @@
     */
    private Long sysUserId;

    @Override
    public String toString() {
        return "ComShopStoreDO{" + "id=" + id + ", name=" + name + ", classifyId=" + classifyId + ", logo=" + logo
            + ", phone=" + phone + ", deliveryType=" + deliveryType + ", remark=" + remark + ", status=" + status
            + ", deleteStatus=" + deleteStatus + ", storeDescribe=" + storeDescribe + ", sale=" + sale + ", saleVolume="
            + saleVolume + ", storeAccount=" + storeAccount + ", storePassword=" + storePassword + ", storeDetail="
            + storeDetail + ", createBy=" + createBy + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
    }

    /**
     * 店铺状态（1.启用  2.禁用）
     */
@@ -136,29 +145,5 @@
    public interface deleteStatus{
        int no = 1;
        int yes = 2;
    }

    @Override
    public String toString() {
        return "ComShopStoreDO{" +
                "id=" + id +
                ", name=" + name +
                ", classifyId=" + classifyId +
                ", logo=" + logo +
                ", phone=" + phone +
                ", deliveryType=" + deliveryType +
                ", remark=" + remark +
                ", status=" + status +
                ", deleteStatus=" + deleteStatus +
                ", storeDescribe=" + storeDescribe +
                ", sale=" + sale +
                ", saleVolume=" + saleVolume +
                ", storeAccount=" + storeAccount +
                ", storePassword=" + storePassword +
                ", storeDetail=" + storeDetail +
                ", createBy=" + createBy +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}