Merge remote-tracking branch 'origin/master'

zengh

2022-07-09 d48d6e9bb0bb48f8338798d8a2cba60396e16698

 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml

@@ -172,4 +172,14 @@
            sys_task
        WHERE 1=1 and YEAR (create_time)=#{time};
    </select>

    <select id="countTaskNum" resultType="java.util.HashMap">
        SELECT
        date_format( time , '%Y-%m' ) AS y,
       count( * ) AS count
        FROM
            sys_task
        WHERE 1=1 and YEAR (time)=#{year}
        GROUP BY y;
    </select>
</mapper>