From 87a9aade5539d7be459059ab07566af148b40a0e Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期三, 28 十二月 2022 19:04:50 +0800
Subject: [PATCH] Merge branch '禅道号268-新的优惠券使用规则-叠加券' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java
index 5450d3b..a19e73d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterProjectDto.java
@@ -11,5 +11,12 @@
     /**椤圭洰鍏宠仈绫诲瀷,涓嶄紶榛樿椤圭洰sku*/
     private Integer type;
     /**鍏叡鏍囪瘑*/
-    private Integer commonId;
+    private String commonId;
+
+    /**绫诲瀷-椤圭洰SKU*/
+    public static final Integer TYPE_SKU = 0;
+    /**绫诲瀷-椤圭洰SPU*/
+    public static final Integer TYPE_SPU = 1;
+    /**绫诲瀷-椤圭洰鎵�灞炴湯绾у垎绫�*/
+    public static final Integer TYPE_TYPE = 2;
 }

--
Gitblit v1.8.0