diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/controller/CardGiftActiveController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/controller/CardGiftActiveController.java index e82b5fa60..686d92f59 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/controller/CardGiftActiveController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/controller/CardGiftActiveController.java @@ -27,7 +27,7 @@ import java.util.List; * @since 2024-08-21 16:47:40 */ @RestController -@RequestMapping("cardGiftActive") +@RequestMapping("/cardGiftActive") public class CardGiftActiveController extends BaseController { /** * 服务对象 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java index 4b22321b3..a24144b0a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java @@ -2,8 +2,11 @@ package com.fuint.business.marketingActivity.cardGiftActive.entity; import java.util.Date; +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 com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -17,6 +20,7 @@ import java.io.Serializable; @Data public class CardGiftActive extends Model { //主键 + @TableId(type = IdType.AUTO) private Integer id; //活动编号 private String activeNum; @@ -25,8 +29,10 @@ public class CardGiftActive extends Model { //礼品卡金额 private Double cardAmount; //有效期开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date effectiveTimeStart; //有效期结束时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date effectiveTimeEnd; //卡类型比如纸卡 使用数据字典 card_gift_type private String cardType; @@ -39,10 +45,12 @@ public class CardGiftActive extends Model { //创建者 private String createBy; //创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date createTime; //更新者 private String updateBy; //更新时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date updateTime; //所属连锁店id private Integer chainStorId;