From 7918b04206c4879f098789c619a4d5637906856d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 03 十月 2023 22:29:59 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/activity/ActivityLimitDto.java |    3 +--
 phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java |   14 +++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java
index a8059fd..bfc28ac 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DConsultationDto.java
@@ -1,19 +1,17 @@
 package com.hz.his.dto;
 
 
+import com.hz.his.dto.common.DCommonDto;
 import lombok.Data;
-
-import java.util.Date;
 
 /**
  * 鍜ㄨ璁板綍
  **/
 @Data
-public class DConsultationDto{
+public class DConsultationDto extends DCommonDto {
     // 璁板綍id 缁ф壙dto宸插瓨鍦�
     private String id;
-    // 鐢ㄦ埛ID
-    private String userId;
+
     // 闂ㄥ簵/璇婃墍ID
     private String shopId;
     // 绉戝缂栫爜
@@ -56,14 +54,8 @@
     private Integer pageNum;
     // 椤垫暟
     private Integer pageSize;
-    // 寮�濮嬫椂闂�
-    private Date startTime;
-    // 缁撴潫鏃堕棿
-    private Date endTime;
     // 鐢ㄦ埛鍚嶇О
     private String userName;
-    // 鍏抽敭璇嶆煡璇� 鏈垚浜ゅ師鍥� 鍜ㄨ鍐呭 澶囨敞
-    private String keyWord;
     // 鍛樺伐瑙掕壊
     private String roleId;
 
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 2933bf9..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
@@ -20,8 +20,7 @@
     /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
 
-    //闄愯喘寮�濮嬫椂闂�
     private Date limitStartTime;
-    //闄愯喘缁撴潫鏃堕棿
+
     private Date limitEndTime;
 }

--
Gitblit v1.8.0