From 25500b42588e6140de0f6e24823adc727a7b5b05 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 04 十二月 2024 17:48:50 +0800
Subject: [PATCH] 1.修复绑定门店bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java | 4 ++++
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
index bd8e336..2785da2 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
@@ -35,4 +35,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Integer startTime;
+ @ApiModelProperty(value = "结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Integer endTime;
+
}
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml
index 7187523..7576bb5 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml
@@ -38,7 +38,7 @@
WHERE
ts.del_flag = 0
AND ts.`status` = 1
- AND id = #{id}
+ AND ts.id = #{id}
GROUP BY
ts.id,
ts.details_picture,
--
Gitblit v1.7.1