From 98fb96938258c6b966e007259860c9cdc8d5e2f2 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
index 2f5a118..63b570e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
@@ -33,5 +33,7 @@
private List<String> orderIdList;
/** 璁㈠崟鏍囪瘑 */
private String orderId;
+ /** 鏍囧織鏍囪瘑 */
+ private String commonId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index edd4d5c..0270bca 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -41,4 +41,6 @@
public static final String TYPE_COMMON_ORDER = "order";
/**鍏叡鏍囪瘑绫诲瀷,鎶藉娲诲姩*/
public static final String TYPE_COMMON_DRAW = "draw";
+ /**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
+ public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
}
--
Gitblit v1.8.0