From 6a9d4b49c03781bbb49a41f1d16e510baa2881aa Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期五, 12 七月 2024 14:09:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test --- 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