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

gongzuming

2024-09-26 af77899d830e854d01b48bc12db04b02116e5ea4

 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">