diff --git a/README.md b/README.md index f4403443..46290dc1 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,9 @@ JAVA版商城系统是基于Java(SpringBoot) + Vue(Element UI) + UniApp开发的 ## 反馈交流 技术交流社区:https://q.crmeb.net -[CRMEB JAVA 技术交流QQ群 1群](点击加群 893839288) +CRMEB JAVA 技术交流QQ群 1群 🈵️ + +[CRMEB JAVA 技术交流QQ群 2群 482685880 🔥](CRMEB Java技术交流2群 点击添加群 482685880) 使用中遇到bug 或者问题可以在gitee 上提 [Issues](https://gitee.com/ZhongBangKeJi/crmeb_java/issues) @@ -152,7 +154,7 @@ CRMEB打通版:https://gitee.com/ZhongBangKeJi/CRMEB ## 反馈交流 技术交流社区:https://q.crmeb.net -CRMEB JAVA 技术交流QQ群 1群 893839288 🈵️ +CRMEB JAVA 技术交流QQ群 1群 🈵️ [CRMEB JAVA 技术交流QQ群 2群 482685880 🔥](CRMEB Java技术交流2群 点击添加群 482685880) diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java b/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java index 202d2226..658513ac 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java @@ -1,8 +1,5 @@ package com.zbkj.crmeb.front.response; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -92,4 +89,7 @@ public class SecKillDetailH5Response implements Serializable { @ApiModelProperty(value = "商品详情") private String content; + + @ApiModelProperty(value = "结束时间(前端用)") + private String timeSwap; } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java index 062445e6..5279336d 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java @@ -456,6 +456,12 @@ public class StoreSeckillServiceImpl extends ServiceImpl