From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java |  295 ----------------------------------------------------------
 1 files changed, 2 insertions(+), 293 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java
index 35ee39d..9dbdfb3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderGoodsDO.java
@@ -1,9 +1,6 @@
 package com.panzhihua.service_community.model.dos;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -113,294 +110,6 @@
     /**
      * 创建时间
      */
-    @TableField(value = "create_at")
+    @TableField(value = "create_at",fill = FieldFill.INSERT)
     private Date createAt;
-
-    /**
-     * 获取订单商品id
-     *
-     * @return id - 订单商品id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * 设置订单商品id
-     *
-     * @param id 订单商品id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取店铺id
-     *
-     * @return store_id - 店铺id
-     */
-    public Long getStoreId() {
-        return storeId;
-    }
-
-    /**
-     * 设置店铺id
-     *
-     * @param storeId 店铺id
-     */
-    public void setStoreId(Long storeId) {
-        this.storeId = storeId;
-    }
-
-    /**
-     * 获取订单id
-     *
-     * @return order_id - 订单id
-     */
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    /**
-     * 设置订单id
-     *
-     * @param orderId 订单id
-     */
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    /**
-     * 获取用户id
-     *
-     * @return user_id - 用户id
-     */
-    public Long getUserId() {
-        return userId;
-    }
-
-    /**
-     * 设置用户id
-     *
-     * @param userId 用户id
-     */
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    /**
-     * 获取订单号
-     *
-     * @return order_no - 订单号
-     */
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    /**
-     * 设置订单号
-     *
-     * @param orderNo 订单号
-     */
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    /**
-     * 获取商品id
-     *
-     * @return goods_id - 商品id
-     */
-    public Long getGoodsId() {
-        return goodsId;
-    }
-
-    /**
-     * 设置商品id
-     *
-     * @param goodsId 商品id
-     */
-    public void setGoodsId(Long goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    /**
-     * 获取商品规格id
-     *
-     * @return goods_attr_id - 商品规格id
-     */
-    public Long getGoodsAttrId() {
-        return goodsAttrId;
-    }
-
-    /**
-     * 设置商品规格id
-     *
-     * @param goodsAttrId 商品规格id
-     */
-    public void setGoodsAttrId(Long goodsAttrId) {
-        this.goodsAttrId = goodsAttrId;
-    }
-
-    /**
-     * 获取规格名称
-     *
-     * @return goods_attr_name - 规格名称
-     */
-    public String getGoodsAttrName() {
-        return goodsAttrName;
-    }
-
-    /**
-     * 设置规格名称
-     *
-     * @param goodsAttrName 规格名称
-     */
-    public void setGoodsAttrName(String goodsAttrName) {
-        this.goodsAttrName = goodsAttrName;
-    }
-
-    /**
-     * 获取购买数量
-     *
-     * @return amount - 购买数量
-     */
-    public Integer getAmount() {
-        return amount;
-    }
-
-    /**
-     * 设置购买数量
-     *
-     * @param amount 购买数量
-     */
-    public void setAmount(Integer amount) {
-        this.amount = amount;
-    }
-
-    /**
-     * 获取商品规格价格
-     *
-     * @return goods_attr_price - 商品规格价格
-     */
-    public BigDecimal getGoodsAttrPrice() {
-        return goodsAttrPrice;
-    }
-
-    /**
-     * 设置商品规格价格
-     *
-     * @param goodsAttrPrice 商品规格价格
-     */
-    public void setGoodsAttrPrice(BigDecimal goodsAttrPrice) {
-        this.goodsAttrPrice = goodsAttrPrice;
-    }
-
-    /**
-     * 获取商品规格图
-     *
-     * @return goods_attr_pic - 商品规格图
-     */
-    public String getGoodsAttrPic() {
-        return goodsAttrPic;
-    }
-
-    /**
-     * 设置商品规格图
-     *
-     * @param goodsAttrPic 商品规格图
-     */
-    public void setGoodsAttrPic(String goodsAttrPic) {
-        this.goodsAttrPic = goodsAttrPic;
-    }
-
-    /**
-     * 获取原价(划线价)
-     *
-     * @return price - 原价(划线价)
-     */
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    /**
-     * 设置原价(划线价)
-     *
-     * @param price 原价(划线价)
-     */
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    /**
-     * 获取包邮价
-     *
-     * @return free_shipping_price - 包邮价
-     */
-    public BigDecimal getFreeShippingPrice() {
-        return freeShippingPrice;
-    }
-
-    /**
-     * 设置包邮价
-     *
-     * @param freeShippingPrice 包邮价
-     */
-    public void setFreeShippingPrice(BigDecimal freeShippingPrice) {
-        this.freeShippingPrice = freeShippingPrice;
-    }
-
-    /**
-     * 获取拼单价
-     *
-     * @return collate_price - 拼单价
-     */
-    public BigDecimal getCollatePrice() {
-        return collatePrice;
-    }
-
-    /**
-     * 设置拼单价
-     *
-     * @param collatePrice 拼单价
-     */
-    public void setCollatePrice(BigDecimal collatePrice) {
-        this.collatePrice = collatePrice;
-    }
-
-    /**
-     * 获取商品名称
-     *
-     * @return goods_name - 商品名称
-     */
-    public String getGoodsName() {
-        return goodsName;
-    }
-
-    /**
-     * 设置商品名称
-     *
-     * @param goodsName 商品名称
-     */
-    public void setGoodsName(String goodsName) {
-        this.goodsName = goodsName;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_at - 创建时间
-     */
-    public Date getCreateAt() {
-        return createAt;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createAt 创建时间
-     */
-    public void setCreateAt(Date createAt) {
-        this.createAt = createAt;
-    }
 }
\ No newline at end of file

--
Gitblit v1.7.1