Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/web/IncomeCollectionController.java

@@ -3,7 +3,6 @@ package com.imed.costaccount.web;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.dto.CollectDTO;
-import com.imed.costaccount.service.CostIncomeGroupService;
 import com.imed.costaccount.service.IncomeCollectionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,7 +36,7 @@ public class IncomeCollectionController extends AbstractController {
     @GetMapping("/getCollections")
     public Result getCollections(@RequestParam(value = "current", defaultValue = "1") Integer current,
                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                 @RequestParam(value = "date", required = false) String date) {
+                                 @RequestParam(value = "date") String date) {
         PageUtils pageUtils = incomeCollectionService.getCollections(current, pageSize, date, getHospId());
         return Result.ok(pageUtils);
     }