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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

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

@@ -17,7 +17,7 @@
        <if test="condition.weight != null">
            AND q.weight = #{condition.weight}
        </if>
        ORDER BY q.sort_by
        ORDER BY CASE WHEN q.parent_id IS NULL THEN 1 ELSE 2 END,q.sort_by, spcg.create_time
    </select>