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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 src/main/resources/mapper/flower/FlowerParamMapper.xml

@@ -18,7 +18,7 @@
                COMMENT #{field.comment}
            </if>
        </foreach>
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT=#{table.label}
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=#{table.label}
    </update>

    <select id="selectParamList" resultType="com.mzl.flower.dto.response.flower.FlowerParamListDTO">