Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-30 b9903ead016b8b1aa68eb04b48fca3b53fdab0d3

 src/main/resources/mapper/calendar/CalendarMapper.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mzl.flower.mapper.CalendarMapper">
<mapper namespace="com.mzl.flower.mapper.calendar.CalendarMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.mzl.flower.entity.CalendarDO">