From 09f35ed2fd2adb0ea412ac3bd707945bc35b6812 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 05 七月 2023 10:08:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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 a76c56d..82af4b1 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
@@ -16,6 +16,8 @@
     private String recordName;
     /**鍏叡鏍囪瘑*/
     private String commonId;
+    /**鍏叡瀛愭爣璇�*/
+    private String commonItemId;
     /**鍏叡绫诲瀷*/
     private String commonType;
 
@@ -35,4 +37,6 @@
     public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
     /**鍏叡鏍囪瘑绫诲瀷,crm鍟嗗搧璇︽儏棰嗗彇浼樻儬鍒�*/
     public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
+    /**鍏叡鏍囪瘑绫诲瀷,璁㈠崟璐拱浼樻儬鍒�*/
+    public static final String TYPE_COMMON_ORDER = "order";
 }

--
Gitblit v1.8.0