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/DAppointDto.java |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
index 4b93b88..e7b6a14 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
@@ -1,6 +1,6 @@
 package com.hz.his.dto;
 
-import com.hz.his.dto.common.OperateDto;
+import com.hz.his.dto.common.DCommonDto;
 import lombok.Data;
 
 /**
@@ -8,27 +8,27 @@
  * 瀵煎嚭棰勭害Dto
  */
 @Data
-public class DAppointDto extends OperateDto {
+public class DAppointDto extends DCommonDto {
 
-    String startTime;
-    String endTime;
-    String shopId;
-    String doctorId;
-    String keyWord;
-    String corpUserName;
-    String doctorName;
-    String type;
-    Integer orderType;
-    Integer isMicApprove;
-    String projectName;
-    String userLevel;
-    String field;
-    String id;
-    String userId;
-    String roleId;
-    String corpUserId;
-    String createCuName;
-    String channelType;
-    String chatCorpName;
-    String appType;
+    private String startTime;
+    private String endTime;
+    private String shopId;
+    private String doctorId;
+    private String keyWord;
+    private String corpUserName;
+    private String doctorName;
+    private String type;
+    private Integer orderType;
+    private Integer isMicApprove;
+    private String projectName;
+    private String userLevel;
+    private String field;
+    private String id;
+    private String userId;
+    private String roleId;
+    private String corpUserId;
+    private String createCuName;
+    private String channelType;
+    private String chatCorpName;
+    private String appType;
 }

--
Gitblit v1.8.0