From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
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