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/ComShopGoodsDO.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
@@ -126,6 +126,16 @@
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    @Override
    public String toString() {
        return "ComShopGoodsDO{" + "id=" + id + ", typeId=" + typeId + ", name=" + name + ", storeId=" + storeId
            + ", goodsPic=" + goodsPic + ", images=" + images + ", status=" + status + ", sale=" + sale
            + ", originalPrice=" + originalPrice + ", price=" + price + ", unit=" + unit + ", order=" + order
            + ", stock=" + stock + ", details=" + details + ", remark=" + remark + ", goodsDescribe=" + goodsDescribe
            + ", deliveryType=" + deliveryType + ", deleteStatus=" + deleteStatus + ", createAt=" + createAt
            + ", updateAt=" + updateAt + "}";
    }

    /**
     * 商品状态(1.出售中  2.已下架  3.回收站)
     */
@@ -149,31 +159,5 @@
    public interface deliveryType{
        int store = 1;
        int express = 2;
    }

    @Override
    public String toString() {
        return "ComShopGoodsDO{" +
                "id=" + id +
                ", typeId=" + typeId +
                ", name=" + name +
                ", storeId=" + storeId +
                ", goodsPic=" + goodsPic +
                ", images=" + images +
                ", status=" + status +
                ", sale=" + sale +
                ", originalPrice=" + originalPrice +
                ", price=" + price +
                ", unit=" + unit +
                ", order=" + order +
                ", stock=" + stock +
                ", details=" + details +
                ", remark=" + remark +
                ", goodsDescribe=" + goodsDescribe +
                ", deliveryType=" + deliveryType +
                ", deleteStatus=" + deleteStatus +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}