From 8b885e206e57b171357874d3ebf51334b2ecd5dc Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 7 Nov 2024 09:55:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/controller/TbShopShareController.java | 6 +----- .../java/cn/ysk/cashier/mybatis/entity/TbShopShare.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java index 863c59d3..e467b652 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopShareController.java @@ -1,20 +1,16 @@ package cn.ysk.cashier.controller; -import cn.ysk.cashier.annotation.AnonymousAccess; -import cn.ysk.cashier.annotation.Log; import cn.ysk.cashier.mybatis.entity.TbShopShare; import cn.ysk.cashier.mybatis.service.TbShopShareService; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.*; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.io.Serializable; import java.util.Arrays; -import java.util.List; /** * 店铺分享(TbShopShare)表控制层 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java index 0397007b..71d66727 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java @@ -64,7 +64,7 @@ public class TbShopShare extends Model { public void setRewardCoupon(String rewardCoupon) { this.rewardCoupon = rewardCoupon; if(StringUtils.isNotBlank(rewardCoupon)){ - this.newCoupons = JSONUtil.parseJSONStrTList(rewardCoupon,ShareCoupons.class); + this.rewardCoupons = JSONUtil.parseJSONStrTList(rewardCoupon,ShareCoupons.class); } } From f567bd821b56061a86e189ebea8a42930cd72811 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 7 Nov 2024 09:57:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E4=BA=AB=20=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E8=87=AA=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java index 71d66727..757bba78 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java @@ -4,7 +4,9 @@ import java.util.Date; import cn.hutool.core.collection.CollectionUtil; import cn.ysk.cashier.utils.JSONUtil; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import org.apache.commons.lang3.StringUtils; @@ -22,6 +24,7 @@ import java.util.List; @SuppressWarnings("serial") public class TbShopShare extends Model { + @TableId(type = IdType.AUTO) private Integer id; //店铺Id private Integer shopId;