From 67926388d2b3b96f6360af6d70fdc56596b6b39d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 28 四月 2024 16:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq-积分抵扣现金' into master-fwq-积分抵扣现金

---
 phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java |   11 +++++++++++
 1 files changed, 11 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 77976ad..fdf078c 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
@@ -14,12 +14,16 @@
     private String userId;
     /** 鍒拌璁㈠崟id */
     private String visitOrderId;
+    /** 闂ㄥ簵鏍囪瘑 */
+    private String shopId;
 
     /** 绛剧讲妯℃澘ID */
     private String signTemplateId;
     /** 绛剧讲浠诲姟妯℃澘鍚嶇О */
     private String signTemplateName;
 
+    /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
+    private Integer opType;
     /** 鐧诲綍鎿嶄綔浜鸿鑹瞚d */
     private String loginRoleId;
 
@@ -40,4 +44,11 @@
 
     /** 绛剧珷id */
     private String sealId;
+
+    /** 瀹氫綅X杞翠綅缃� */
+    private String positionX;
+    /** 瀹氫綅Y杞翠綅缃� */
+    private String positionY;
+    /** 瀹氫綅椤电爜.棣栭〉浠�1寮�濮� */
+    private int positionPageNo = 1;
 }

--
Gitblit v1.8.0