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

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberTaskSimpleVo.java

@@ -18,7 +18,7 @@
    @ApiModelProperty(value = "任务时间")
    private Date taskDate;

    @ApiModelProperty("任务内容")
    @ApiModelProperty(value="任务内容")
    private String taskContent;