From e693b1283947d57b8f4121beab73ff506f2cb2ab Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 04 三月 2024 10:10:32 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 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