Merge remote-tracking branch 'origin/20210223' into 20210223

operation_manager/src/main/java/com/huaxu/task/controller/PlanStatisticsController.java

@@ -104,11 +104,11 @@ public class PlanStatisticsController {
         return new AjaxMessage<>(ResultStatus.OK, result );
     }
     /**
-     * 查询任务变化趋势
-     * @return Response对象
+     * 查询任务变化趋势和人均情况
+     * * @return Response对象
      */
     @RequestMapping(value = "selectTaskChangeTrend", method = RequestMethod.GET)
-    @ApiOperation(value = "查询任务情况")
+    @ApiOperation(value = "查询任务变化趋势和人均情况")
     public AjaxMessage<List<TaskChangeTendDto>> selectTaskChangeTrend(
             @ApiParam(value = "开始时间", required = true) @RequestParam String startDate,
             @ApiParam(value = "结束时间", required = false) @RequestParam(required = false) String endDate,

operation_manager/src/main/java/com/huaxu/task/dto/TaskChangeTendDto.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @ApiModel("任务变化趋势")
 public class TaskChangeTendDto implements Serializable {
 
-    @ApiModelProperty(value = "任务数")
+    @ApiModelProperty(value = "创建时间")
     private String dateCreate;
 
     @ApiModelProperty(value = "任务数")