From c800715e798d45e50aa6b8e6930a7a680526177d Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 10 八月 2022 14:27:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
index bda847d..ce3d55d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/ActivityDto.java
@@ -12,5 +12,10 @@
 public class ActivityDto extends PageDto {
     /**闂ㄥ簵鏍囪瘑 */
     private String shopId;
+    /**鍥㈣喘鍟嗗搧绫诲瀷鏍囪瘑 */
+    private String typeId;
+    /**鍥㈣喘娲诲姩鏍囪瘑 */
+    private String groupBuyId;
+
 
 }

--
Gitblit v1.8.0