From c2af7240d43586b8e3cc295e9e97f7d24278025d Mon Sep 17 00:00:00 2001 From: cmg <527198563@qq.com> Date: 星期一, 27 五月 2024 14:37:54 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-stander --- phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 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 2bea684..9a31982 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 @@ -3,6 +3,8 @@ import com.hz.his.dto.PageDto; import lombok.Data; +import java.util.List; + /** * @USER: fhx * @DATE: 2024/3/6 @@ -14,12 +16,20 @@ private String userId; /** 鍒拌璁㈠崟id */ private String visitOrderId; + /** 闂ㄥ簵鏍囪瘑 */ + private String shopId; /** 绛剧讲妯℃澘ID */ private String signTemplateId; /** 绛剧讲浠诲姟妯℃澘鍚嶇О */ private String signTemplateName; + /** 妯℃澘绫诲瀷(鐢靛瓙鐥呭巻鍜屽鏂规椂閫夋嫨鐨勬ā鏉�) */ + private String templateType; + /** 绛剧讲浠诲姟缂栧彿 */ + private String signTaskId; + /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */ + private Integer opType; /** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */ private String loginRoleId; @@ -41,10 +51,26 @@ /** 绛剧珷id */ private String sealId; + //浣滃簾绛剧讲鐢ㄥ埌 /** 瀹氫綅X杞翠綅缃� */ private String positionX; /** 瀹氫綅Y杞翠綅缃� */ private String positionY; /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */ private int positionPageNo = 1; + /** 绛惧悕瀹藉害 */ + private Integer width; + /** 绛惧悕楂樺害 */ + private Integer height; + + //鍙戣捣鍒涘缓绛剧讲浠诲姟鐢ㄥ埌 + /** 鍙備笌浜虹被鍨�(FddActorConstants) */ + private String actorType; + /** 鍙備笌浜鸿瘉浠剁被鍨� */ + private String certType; + +// /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */ +// private String actorListStr; +// /** 绛剧讲鍙備笌浜� */ +// private List<FddActorDto> actorList; } -- Gitblit v1.8.0