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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 3eab1ff..d9e6954 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -20,6 +20,8 @@
     private String operatorId;
     /**鎿嶄綔浜哄悕绉�*/
     private String operatorName;
+    /**鎿嶄綔浜虹被鍨�*/
+    private Integer operatorType;
     /**娲诲姩鏍囪瘑*/
     private String groupBuyId;
     private String id;
@@ -40,6 +42,8 @@
     /*鐢ㄦ埛浼樻儬鍒�*/
     private String couponNumberId;
 
+
+
     //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
     /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
     private String couponGoodsArr;

--
Gitblit v1.8.0