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

jiangqs

2023-05-10 87f18dcf64a778555deb85312d4af93f86625c07

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java

@@ -43,7 +43,8 @@
     */
    @Override
    public List<MerAgencyTaskPageVo> pageMerAgencyTask(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
        merAgencyTaskPageDto.setNowDay(DateUtils.parseDateToStr("YYYY-MM-DD",new Date()));
        String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
        merAgencyTaskPageDto.setNowDay(nowDay);
        List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskMapper.pageMerAgencyTask(page, merAgencyTaskPageDto);
        return merAgencyTaskPageVoList;
    }