From c4d73aa5200c7da5aec927096c8290f968ad19b3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 20 五月 2024 16:19:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 1f08e3e..79b5aee 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;
@@ -54,12 +56,19 @@
private String positionY;
/** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
private int positionPageNo = 1;
+ /** 绛惧悕瀹藉害 */
+ private Integer width;
+ /** 绛惧悕楂樺害 */
+ private Integer height;
//鍙戣捣鍒涘缓绛剧讲浠诲姟鐢ㄥ埌
/** 鍙備笌浜虹被鍨�(FddActorConstants) */
private String actorType;
/** 鍙備笌浜鸿瘉浠剁被鍨� */
private String certType;
- /** 绛剧讲鍙備笌浜� */
- private List<FddActorDto> actorList;
+
+// /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
+// private String actorListStr;
+// /** 绛剧讲鍙備笌浜� */
+// private List<FddActorDto> actorList;
}
--
Gitblit v1.8.0