From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期日, 06 八月 2023 11:29:10 +0800 Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 53de4eb..ee58869 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 @@ -17,8 +17,8 @@ public class MemberTotalChangeDto { - @ApiModelProperty(value = "会员id") - private String memberId; + @ApiModelProperty(value = "用户id") + private Long userId; @ApiModelProperty(value = "积分变化") private Integer changeIntegral; @@ -42,7 +42,7 @@ private Integer serviceCount; @ApiModelProperty(value = "下次跟进时间") - private Date nextTaskTime; + private String nextTaskTime; @ApiModelProperty(value = "活动时间") private Date activityTime; -- Gitblit v1.7.1