Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-06 beeda8df0023376dbb2021148a021731dc4aedb0

 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;