From ab886163b7291ef0de27cf8fad63eb80c5fc6107 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 25 七月 2024 15:01:38 +0800
Subject: [PATCH] Merge branch 'fhx-prod-秒杀日历' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 3594f19..b64b773 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -22,9 +22,9 @@
/**浣跨敤浼犲�肩殑骞冲彴鏉ユ簮:0鍚�1鏄紝榛樿鍚�*/
private Integer usedTransmitApp = 0;
- /**蹇呭～ 骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿) */
+ /**骞冲彴鏉ユ簮:鏉ユ簮搴旂敤appId(鍒涘缓璁㈠崟骞冲彴,绯荤粺榛樿),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭～ */
private String appId;
- /**蹇呭～ 鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～) */
+ /**鏉ユ簮搴旂敤缂栫爜(鍟嗘埛璁剧疆骞冲彴缂栫爜,绯荤粺榛樿,浠ｇ爜蹇呭～),浣跨敤浼犲�肩殑骞冲彴鏉ユ簮蹇呭～ */
private String appIdCode;
/*蹇呭～ 閿�鍞鍗曟潵婧�,閿�鍞彲浠ラ�夋嫨
@@ -112,4 +112,9 @@
private String activityPageCode;
/**娲诲姩鍖哄垎鏍囬*/
private String activityPageName;
+
+ /** 璁㈠崟鏄惁瑕佽�佸甫鏂拌繑浣�(0鍚�1鏄�) */
+ private Integer isLdxRebate = 1;
+ /** 璁㈠崟鏄惁鑳界敤浼樻儬鍒�(0鍚�1鏄�) */
+ private Integer isCanUseCoupon = 1;
}
--
Gitblit v1.8.0