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/TreatAfterEmployeeDto.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java
index 010257e..3609e6b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/treat/TreatAfterEmployeeDto.java
@@ -11,5 +11,10 @@
     /**浜哄憳绫诲瀷,涓嶄紶榛樿鍖荤敓绫诲瀷*/
     private Integer type;
     /**浜哄憳鏍囪瘑(鍛樺伐鏍囪瘑)*/
-    private Integer commonId;
+    private String commonId;
+
+    /**浜哄憳绫诲瀷-鍖荤敓*/
+    public static final Integer TYPE_DOCTOR = 0;
+    /**浜哄憳绫诲瀷-鎶ゅ+*/
+    public static final Integer TYPE_NURSE = 1;
 }

--
Gitblit v1.8.0