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

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java

@@ -43,6 +43,9 @@
    @ApiModelProperty(value="下次任务时间")
    private String nextTaskDate;

    @ApiModelProperty(value="下次任务紧急情况")
    private String emergencyState;;

    @ApiModelProperty(value="下次任务内容")
    private String nextTaskContent;