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/ComShopGoodsAttrDO.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
@@ -62,7 +62,7 @@
    private String attrPic;

    /**
     * 是否是默认规格（1.是  2.否）
     * 是否是默认规格（1.是 2.否）
     */
    private Integer isDefault;

@@ -85,19 +85,9 @@

    @Override
    public String toString() {
        return "ComShopGoodsAttrDO{" +
                "id=" + id +
                ", goodsId=" + goodsId +
                ", storeId=" + storeId +
                ", goodsName=" + goodsName +
                ", goodsAttr=" + goodsAttr +
                ", stock=" + stock +
                ", sale=" + sale +
                ", attrPic=" + attrPic +
                ", isDefault=" + isDefault +
                ", price=" + price +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
        return "ComShopGoodsAttrDO{" + "id=" + id + ", goodsId=" + goodsId + ", storeId=" + storeId + ", goodsName="
            + goodsName + ", goodsAttr=" + goodsAttr + ", stock=" + stock + ", sale=" + sale + ", attrPic=" + attrPic
            + ", isDefault=" + isDefault + ", price=" + price + ", createAt=" + createAt + ", updateAt=" + updateAt
            + "}";
    }
}