From 3ca15fea872010606b5b96a4c11d0d6409dd0be7 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 18 九月 2023 18:09:05 +0800 Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master --- 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