Compare commits

..

No commits in common. "9d8bd25072de0c988baeec1659d6f025997cc545" and "c9f6484428b36b2120be601bc3739115603c35d7" have entirely different histories.

2 changed files with 1 additions and 9 deletions

View File

@ -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 {
/**
* 服务对象

View File

@ -2,11 +2,8 @@ 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;
@ -20,7 +17,6 @@ import java.io.Serializable;
@Data
public class CardGiftActive extends Model<CardGiftActive> {
//主键
@TableId(type = IdType.AUTO)
private Integer id;
//活动编号
private String activeNum;
@ -29,10 +25,8 @@ public class CardGiftActive extends Model<CardGiftActive> {
//礼品卡金额
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;
@ -45,12 +39,10 @@ public class CardGiftActive extends Model<CardGiftActive> {
//创建者
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;