From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 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..cebc30a 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,29 @@
private String marketActivityId;
/** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */
private String activityCouponId;
+ /** 钀ラ攢娲诲姩鍒嗙粍id */
+ private String groupId;
+ /** 钀ラ攢娲诲姩棰嗗彇璁板綍瀛愰」itemid */
+ private String recordItemId;
+ /**瀹℃牳鐘舵�� 鏌ヨ 0=鏃犻渶瀹℃壒 1=寰呭鎵� 2=瀹℃壒鎴愬姛 3=瀹℃壒澶辫触*/
+ private Integer approvalStatus;
+ /**瀹℃壒鐘舵�� 閫氳繃=agree 鎷掔粷=reject*/
+ private String statusStr;
- /** 骞冲彴绫诲瀷 */
+
+ /** 骞冲彴绫诲瀷(PlatformConstants) */
private String platformType;
/** 鎿嶄綔浜烘爣璇� */
private String opId;
/** 鎿嶄綔浜哄悕绉� */
private String opName;
- /** 鎿嶄綔浜虹被鍨� */
+ /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */
private Integer opType;
+ /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
+ private String opRoleId;
+
+ /**瀹℃壒澶囨敞*/
+ private String remark;
+
}
--
Gitblit v1.8.0