From 9574cd990b7e32f966edc45824f8f952b5215d58 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 18 七月 2023 19:58:49 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java | 3 ++-
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 3 +--
2 files changed, 3 insertions(+), 3 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 40f743f..2f57aab 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
@@ -1,7 +1,5 @@
package com.hz.his.dto.coupon;
-
-
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -42,6 +40,7 @@
private String orderId;
/*鐢ㄦ埛浼樻儬鍒�*/
private String couponNumberId;
+
//寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
/** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
private String couponGoodsArr;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
index b4f4ea8..7df2a42 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
@@ -12,5 +12,6 @@
private String applyId;
/**瀹℃牳鏍囪瘑*/
private String examineId;
-
+ /**鏄惁鐩存帴閫氳繃:0鍚�1鏄�*/
+ private Integer isPass;
}
--
Gitblit v1.8.0