From b9fe9698efd8633711b7564302fd3249a47671f0 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:33:25 +0800
Subject: [PATCH] 查询问卷记录优化

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index 2495d9b..d6eed8b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 /**
- * Created with IntelliJ IDEA.
+ * 寮�鍗曞弬鏁癉to
  *
  * @Author: zhouxiang
  * @Date: 2022/08/31/10:32
@@ -14,16 +14,23 @@
  */
 @Data
 public class OrderPHisDto extends PageDto {
-    //type:0:鑽夌 1:鎻愪氦 2:缁撹处,crm濉�2锛屽繀濉�
+    /**0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉�*/
     private String type;
-    //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鍚庣澶勭悊锛岃幏鍙栧綋鍓嶇櫥褰曚汉鏍囪瘑,crm濉敤鎴凤紝蹇呭~
+    /**鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~*/
     private String operatorId;
-    //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~
+    /**鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~*/
     private String shopId;
-    //鎬昏鍗曚俊鎭紝蹇呭~
-    private OrdersTotalDto orderTotal;
-    //涓�绾у瓙璁㈠崟锛屽繀濉�
-    private List<OrderItemDto> orderItem;
-    //寮�鍙戜汉闆嗗悎
-    private OrderDeveloperDto orderDeveloper;
+    /**鎬昏鍗曚俊鎭紝蹇呭~*/
+    private OrdersPHisTotalDto orderTotal;
+    /**涓�绾у瓙璁㈠崟锛屽繀濉�*/
+    private List<OrderItemPHisDto> orderItem;
+    /**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
+    private List<OrderDeveloperDto> orderDeveloper;
+
+    /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+    private Integer cardPass = 0;
+
+    /** 璁㈠崟鍗囧崟鍏宠仈鍒楄〃 */
+    private List<OrderRiseDto> orderRiseList;
+
 }

--
Gitblit v1.8.0