From 99f5cda938c41638dc963d364204716aa62e8ba1 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 09 二月 2023 15:37:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java
index 6f44583..7f90e80 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterVideoDto.java
@@ -1,5 +1,6 @@
 package com.hz.his.dto.treat;
 
+import com.hz.his.dto.PageDto;
 import lombok.Data;
 
 import java.util.List;
@@ -9,9 +10,10 @@
  * 鏈悗瑙嗛
  * */
 @Data
-public class TreatAfterVideoDto{
-    /**浜哄憳淇℃伅*/
+public class TreatAfterVideoDto extends PageDto {
+    /*******************2022-11-17:鏉′欢鏆傛椂鏄苟涓旂殑鍏崇郴***************************/
+    /**浜哄憳鏉′欢闆嗗悎*/
     private List<TreatAfterEmployeeDto> employeeDtoList;
-    /**椤圭洰淇℃伅*/
+    /**椤圭洰鏉′欢闆嗗悎*/
     private List<TreatAfterProjectDto> projectDtoList;
 }

--
Gitblit v1.8.0