From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/activity/SecKillActivityDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/SecKillActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/SecKillActivityDto.java
index 3377b2a..52ea1cf 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/SecKillActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/SecKillActivityDto.java
@@ -15,7 +15,11 @@
 
     /** 鐢ㄦ埛id */
     private String userId;
+    /** 鏉ユ簮鏍囪瘑 */
+    private String formCode;
 
+//    /** 鏄惁妫�鏌ュ彲瑙佷汉缇ら檺鍒�(0鍚�1鏄�) */
+//    private Integer isChekSeeLimit = 0;
     /** 鍙浜虹兢 - 娑堣垂闄愬埗閲戦(0涓嶉檺鍒�) */
     private BigDecimal seeLcAmount;
     /** 鍙浜虹兢 - 闂ㄥ簵id */

--
Gitblit v1.8.0