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/marketing/MarketActivityDto.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
index 69abfb4..00f9493 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
@@ -13,7 +13,7 @@
 
     /** 鍒嗙被id */
     private String classifyId;
-    /** 鐘舵�� */
+    /** 鐘舵��:0鏈紑濮�1杩涜涓�2宸茬粨鏉� */
     private Integer status;
     /** 寮�濮嬫椂闂� */
     private String startTime;
@@ -25,8 +25,25 @@
     private Integer isProject;
     /** 鏄惁鍚屾鑹捐姱浼� */
     private Integer isSyncCrm;
+    /** 鏄惁涓婁笅鏋� */
+    private Integer isUp;
 
-    //闂ㄥ簵鍔╂墜浣跨敤鑷姩-------------------
+    /** 浼氬憳绛夌骇 */
+    private String userLevel;
+    /** 闂ㄥ簵id/鎵�灞為棬搴梚d */
+    private String shopId;
+    /** 鏄惁鏄鍙栦紭鎯犲埜 */
+    private Integer isReceiveCoupon;
+    /** 鏄惁鏄娇鐢ㄤ紭鎯犲埜 */
+    private Integer isUseCoupon;
+    /** 鏄惁娑堣垂 */
+    private Integer isConsume;
+
+    /** 鍏宠仈椤圭洰绫诲瀷 */
+    private String commonType;
+
+
+    //-------------------
     /** 澶氶棬搴梚d锛堥�楀彿鍒嗗壊锛� */
     private String shopIds;
     /** 鐢ㄦ埛id */
@@ -37,14 +54,19 @@
     private String marketActivityId;
     /** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */
     private String activityCouponId;
+    /** 钀ラ攢娲诲姩鍒嗙粍id */
+    private String groupId;
 
-    /** 骞冲彴绫诲瀷 */
+    /** 骞冲彴绫诲瀷(PlatformConstants) */
     private String platformType;
     /** 鎿嶄綔浜烘爣璇� */
     private String opId;
     /** 鎿嶄綔浜哄悕绉� */
     private String opName;
-    /** 鎿嶄綔浜虹被鍨� */
+    /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
     private Integer opType;
+    /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
+    private String opRoleId;
+
 
 }

--
Gitblit v1.8.0