From 97bb8aca42a1d734380d4dde460f8ce389196a01 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 19 九月 2023 11:26:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-phis下载中心

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

diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
index db53b84..141973a 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java
@@ -1,5 +1,6 @@
 package com.hz.his.dto;
 
+import com.hz.his.dto.common.DCommonDto;
 import com.hz.his.dto.common.OperateDto;
 import lombok.Data;
 
@@ -8,7 +9,7 @@
  * 瀵煎嚭鍛樺伐Dto
  */
 @Data
-public class DEmployeeDto extends OperateDto {
+public class DEmployeeDto extends DCommonDto {
     private Integer isJob;
     private Integer isPerformanceEmp;
     private String roleUniqueStr;

--
Gitblit v1.8.0