From 264da3c5b3080c656505a2a7b9c8349b29e667f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 29 Oct 2024 09:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E5=9D=97=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eladmin-system/pom.xml                        |   6 +-
 .../mybatis/entity/TbPointsGoodsSetting.java  | 115 +++++++++---------
 2 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
index 33891504..2b543b9e 100644
--- a/eladmin-system/pom.xml
+++ b/eladmin-system/pom.xml
@@ -106,11 +106,13 @@
             <version>6.1.4</version>
         </dependency>
 
+        <!--
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>2.1.4</version>
         </dependency>
+        -->
 
 <!--        <dependency>-->
 <!--            <groupId>com.baomidou</groupId>-->
@@ -120,12 +122,12 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.5.3.1</version>
+            <version>3.5.7</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.3.1</version>
+            <version>3.5.7</version>
         </dependency>
 
         <!-- zxing生成二维码 -->
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java
index d3292cfe..62fe7277 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbPointsGoodsSetting.java
@@ -1,5 +1,6 @@
 package cn.ysk.cashier.mybatis.entity;
 
+
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,64 +15,64 @@ import java.util.Date;
  * @since 2.0 2024-10-25
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("tb_points_goods_setting")
 public class TbPointsGoodsSetting {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	* id
-	*/
-	@TableId(type = IdType.AUTO)
-	private Long id;
-	/**
-	* 店铺id
-	*/
-	private Long shopId;
-	/**
-	* 商品类型 physical-实物 coupon-优惠劵
-	*/
-	private String goodsCategory;
-	/**
-	* 商品名称
-	*/
-	private String goodsName;
-	/**
-	* 商品图片URL
-	*/
-	@TableField(updateStrategy = FieldStrategy.ALWAYS)
-	private String goodsImageUrl;
-	/**
-	* 所需积分
-	*/
-	private Integer requiredPoints;
-	/**
-	* 额外价格
-	*/
-	private BigDecimal extraPrice;
-	/**
-	* 排序(权重)，数字越高，显示约靠前
-	*/
-	private Integer sort;
-	/**
-	* 数量
-	*/
-	private Integer quantity;
-	/**
-	* 商品详情
-	*/
-	@TableField(updateStrategy = FieldStrategy.ALWAYS)
-	private String goodsDescription;
-	/**
-	* 是否上架 1-是 0-否
-	*/
-	private Integer status;
-	/**
-	* 创建时间
-	*/
-	private Date createTime;
-	/**
-	* 更新时间
-	*/
-	private Date updateTime;
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+    /**
+     * 商品类型 physical-实物 coupon-优惠劵
+     */
+    private String goodsCategory;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 商品图片URL
+     */
+    @TableField(value = "goods_image_url", updateStrategy = FieldStrategy.ALWAYS)
+    private String goodsImageUrl;
+    /**
+     * 所需积分
+     */
+    private Integer requiredPoints;
+    /**
+     * 额外价格
+     */
+    private BigDecimal extraPrice;
+    /**
+     * 排序(权重)，数字越高，显示约靠前
+     */
+    private Integer sort;
+    /**
+     * 数量
+     */
+    private Integer quantity;
+    /**
+     * 商品详情
+     */
+    @TableField(value = "goods_description", updateStrategy = FieldStrategy.ALWAYS)
+    private String goodsDescription;
+    /**
+     * 是否上架 1-是 0-否
+     */
+    private Integer status;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
 }
\ No newline at end of file