From 2623b35166b8e08246b3ef5233b9e411125abd80 Mon Sep 17 00:00:00 2001 From: Andru <769883346@qq.com> Date: 星期三, 08 十一月 2023 11:37:08 +0800 Subject: [PATCH] Merge branch 'master-prod-new' 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