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

src/main/java/org/rcisoft/business/device/report/controller/ReportController.java

@@ -26,7 +26,7 @@ public class ReportController {
     @ApiImplicitParams({@ApiImplicitParam(name = "proId", value = "项目主键", required = true, dataType = "字符串"),
             @ApiImplicitParam(name = "year", value = "年", required = true, dataType = "数字"),
             @ApiImplicitParam(name = "month", value = "月", required = true, dataType = "数字"),
-            @ApiImplicitParam(name = "month", value = "日", required = true, dataType = "数字")})
+            @ApiImplicitParam(name = "day", value = "日", required = true, dataType = "数字")})
     @RequestMapping("/download")
     public void download(HttpServletResponse response, @RequestParam String proId, Integer year, Integer month, Integer day) {
         reportServiceImpl.download(response, proId, year, month, day);