From b99a9da5e9d943ea1b6e5578501a11dc19fae553 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 10 十月 2023 17:32:58 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-download-feign/src/main/java/com/hz/his/dto/DEmployeeDto.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..4270eba 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,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,7 +8,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