From 9edd584fa8772f1c06536d851fc2e60385d16d51 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 8 Feb 2023 17:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=81=97=E6=9F=A5=E8=AF=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java | 9 +++++++++
 src/main/resources/mapper/szwh/GoodsMapper.xml  | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java b/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
index de7dbb5..833fdad 100644
--- a/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
+++ b/src/main/java/cn/chjyj/szwh/vo/GoodsListVo.java
@@ -24,6 +24,7 @@ public class GoodsListVo {
     private Integer goods_entrust;//委托类型
     private BigDecimal price; //gd 价格
     private String canceltime; //撤销时间
+    private String updatetime;
     private String goods_ownership_str; //权益
     private String goods_image;
     private Integer stock;
@@ -50,6 +51,14 @@ public class GoodsListVo {
         this.createtime = createtime;
     }
 
+    public String getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(String updatetime) {
+        this.updatetime = updatetime;
+    }
+
     public String getGoods_islicode() {
         return goods_islicode;
     }
diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml
index ff662c6..55f6c16 100644
--- a/src/main/resources/mapper/szwh/GoodsMapper.xml
+++ b/src/main/resources/mapper/szwh/GoodsMapper.xml
@@ -64,8 +64,8 @@
 
     <!-- 筛选商品列表 -->
     <select id="getGoodsVoList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.vo.GoodsListVo">
-        SELECT g.id,g.username,gd.goods_name,gd.goods_image,gd.price,
-           gd.updatetime,gd.goods_islicode,gd.goods_entrust,gd.goods_type,gd.charge_type
+        SELECT g.id,g.username,gd.goods_name,gd.goods_image,gd.price,gd.createtime,
+           gd.updatetime,gd.goods_islicode,gd.goods_entrust,gd.goods_type,gd.charges_type
         FROM goods as g
         INNER JOIN goods_detail as gd
         ON g.goods_detail_id=gd.id