From 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期六, 07 十月 2023 10:46:47 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq抽奖配置 --- phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java index d478951..effa337 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java @@ -1,8 +1,14 @@ package com.hz.his.dto.activity; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gitee.sunchenbin.mybatis.actable.annotation.Column; +import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant; import com.hz.his.dto.PageDto; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 闄愬埗 @@ -13,4 +19,8 @@ private String id; /**鐢ㄦ埛鏍囪瘑*/ private String userId; + + private Date limitStartTime; + + private Date limitEndTime; } -- Gitblit v1.8.0