From becc7f3f5f3e424a02deaa1a5849f830d6ed7da7 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 18:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
index 21d9135..00171f8 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java
@@ -46,7 +46,10 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date lastEndTime;
-
+    /**鏄惁鍙敤澧炲�奸噾缁撹处*/
+    private Integer useIncrement;
+    /**鏄惁鍙敤浼樻儬鍒哥粨璐�*/
+    private Integer useCoupon;
     /**绫诲瀷-鍗¢」*/
     public static final Integer LIMIT_CARD_ITEM = 0;
     /**绫诲瀷-淇冮攢*/

--
Gitblit v1.8.0