From f52dc5114638600e934cc82fe63c4a25f22594cc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 13 五月 2024 10:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
index 5718735..c273def 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -23,6 +23,8 @@
     private String signTemplateId;
     /** 绛剧讲浠诲姟妯℃澘鍚嶇О */
     private String signTemplateName;
+    /** 妯℃澘绫诲瀷(鐢靛瓙鐥呭巻鍜屽鏂规椂閫夋嫨鐨勬ā鏉�) */
+    private String templateType;
 
     /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
     private Integer opType;
@@ -61,8 +63,8 @@
     /** 鍙備笌浜鸿瘉浠剁被鍨� */
     private String certType;
 
-    /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
-    private String actorListStr;
-    /** 绛剧讲鍙備笌浜� */
-    private List<FddActorDto> actorList;
+//    /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
+//    private String actorListStr;
+//    /** 绛剧讲鍙備笌浜� */
+//    private List<FddActorDto> actorList;
 }

--
Gitblit v1.8.0