Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 27b2410ba89a2c73097f7f901fb9bc1c72913a3b

 src/main/resources/mapper/flower/FlowerMarkupPsSpCgMapper.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>