From a458dab7990cf8f9d9f834a19db4f2d8b549b467 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 23 四月 2024 14:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金
---
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