From 5d542ef50426fdaf5c06d09f6a7c5d13529ea4ac Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 14 六月 2024 17:07:33 +0800
Subject: [PATCH] Merge branch 'master-fwq-团购提前扣取金额' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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 d773f93..356f7cb 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
@@ -19,10 +19,17 @@
/** 闂ㄥ簵鏍囪瘑 */
private String shopId;
+ /** 瑙掕壊绫诲瀷 */
+ private String roleType;
+
/** 绛剧讲妯℃澘ID */
private String signTemplateId;
/** 绛剧讲浠诲姟妯℃澘鍚嶇О */
private String signTemplateName;
+ /** 妯℃澘绫诲瀷(鐢靛瓙鐥呭巻鍜屽鏂规椂閫夋嫨鐨勬ā鏉�) */
+ private String templateType;
+ /** 绛剧讲浠诲姟缂栧彿 */
+ private String signTaskId;
/** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
private Integer opType;
@@ -47,22 +54,22 @@
/** 绛剧珷id */
private String sealId;
- //浣滃簾绛剧讲鐢ㄥ埌
- /** 瀹氫綅X杞翠綅缃� */
- private String positionX;
- /** 瀹氫綅Y杞翠綅缃� */
- private String positionY;
- /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
- private int positionPageNo = 1;
+// //浣滃簾绛剧讲鐢ㄥ埌
+// /** 瀹氫綅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;
+ /** 绛剧讲鍙備笌浜�(鍥犱负闈瀓son鎺ュ弬锛屾墍浠ヨ鐢ㄤ釜瀛楃瀵硅薄鎺ユ敹) */
+ private String actorListStr;
+ /** 绛剧讲鍙備笌浜� */
+ private List<FddActorDto> actorList;
}
--
Gitblit v1.8.0