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..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; @@ -64,7 +67,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); } }