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/ComShopOrderGoodsDO.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
@@ -84,19 +84,9 @@

    @Override
    public String toString() {
        return "ComShopOrderGoodsDO{" +
                "id=" + id +
                ", storeId=" + storeId +
                ", orderId=" + orderId +
                ", userId=" + userId +
                ", orderNo=" + orderNo +
                ", goodsId=" + goodsId +
                ", goodsAttrId=" + goodsAttrId +
                ", amount=" + amount +
                ", goodsAttrPrice=" + goodsAttrPrice +
                ", goodsAttrPic=" + goodsAttrPic +
                ", goodsName=" + goodsName +
                ", createAt=" + createAt +
                "}";
        return "ComShopOrderGoodsDO{" + "id=" + id + ", storeId=" + storeId + ", orderId=" + orderId + ", userId="
            + userId + ", orderNo=" + orderNo + ", goodsId=" + goodsId + ", goodsAttrId=" + goodsAttrId + ", amount="
            + amount + ", goodsAttrPrice=" + goodsAttrPrice + ", goodsAttrPic=" + goodsAttrPic + ", goodsName="
            + goodsName + ", createAt=" + createAt + "}";
    }
}