From 58d2e3646fe5b911e2d3110679b4ece5f38cad16 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 15:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
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 49a2076..73909d5 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
@@ -4,6 +4,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* 娲诲姩瑙勫垯鍙戦�佸弬鏁�
* @author wrh
@@ -18,6 +20,9 @@
private String groupBuyId;
//appid
private String appId;
+ private String id;
+ private String userId;
+ private BigDecimal ordersTotal;
/**鐘舵��(娲诲姩瑙勫垯)*/
private String status;
--
Gitblit v1.8.0