From c73425451381d5338de8a47253bae007eddc7c8f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 31 五月 2024 17:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
index d263e82..f2c2090 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DVisitOrderDto.java
@@ -1,13 +1,14 @@
 package com.hz.his.dto;
 
 
+import com.hz.his.dto.common.DCommonDto;
 import lombok.Data;
 
 /**
  * 鍒拌璁㈠崟(瀵煎尰)
  **/
 @Data
-public class DVisitOrderDto {
+public class DVisitOrderDto extends DCommonDto {
 
     private String doctorName;
     private String userName;
@@ -15,8 +16,6 @@
     private String nurseName;
     private String shopId;
     private String status;
-    private String startTime;
-    private String endTime;
 
 
 }

--
Gitblit v1.8.0