From 7b7e9006a52ea69a1fbf778ccabc562024e37403 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 10 十一月 2023 17:39:00 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
index 085b711..0ad3d11 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DOrderDto.java
@@ -1,16 +1,15 @@
package com.hz.his.dto;
+import com.hz.his.dto.common.DCommonDto;
import lombok.Data;
/**
* 璁㈠崟
**/
@Data
-public class DOrderDto {
+public class DOrderDto extends DCommonDto {
- private String startTime;
- private String endTime;
private Integer status;
private String orderNo;
private String type;
@@ -39,12 +38,10 @@
private String doctorName;
private String hisCorpUserName;
private String userName;
- private String userId;
private String shopIds;
private String roleUniqueStr;
private String userStatus;
private String userLevel;
private String internetCorpUserId;
private String internetCorpUserName;
- private String keyWord;
}
--
Gitblit v1.8.0