From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java
index e7d96c4..d22022a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java
@@ -42,7 +42,7 @@
private Integer serviceCount;
@ApiModelProperty(value = "下次跟进时间")
- private Date nextTaskTime;
+ private String nextTaskTime;
@ApiModelProperty(value = "活动时间")
private Date activityTime;
@@ -59,4 +59,12 @@
@ApiModelProperty(value = "单品订单变化")
private Integer goodsOrderChange;
+ @ApiModelProperty(value="订单")
+ private String orderId;
+
+ @ApiModelProperty(value="订单")
+ private String orderNo;
+
+ @ApiModelProperty(value="消费记录")
+ private Date consumeTime;
}
--
Gitblit v1.7.1