Merge remote-tracking branch 'origin/master'

ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayHomePageController.java

@@ -9,6 +9,7 @@ import com.ruoyi.pay.domain.vo.PayEmployeeInfoVo;
 import com.ruoyi.pay.service.IPayEmployeeInfoService;
 import com.ruoyi.pay.service.IPayHomePageService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,7 +44,7 @@ public class PayHomePageController extends BaseController {
      * @return
      */
     @GetMapping("/chuqin")
-    public  R<List<Map<String, String>>> getChuQinDataList(@RequestParam("date") Date date,@RequestParam("tenantId") Long tenantId) {
+    public  R<List<Map<String, String>>> getChuQinDataList(@DateTimeFormat(pattern="yyyy-MM")@RequestParam("date") Date date, @RequestParam("tenantId") Long tenantId) {
         return homePageService.getChuQinData(date,tenantId);
     }