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

cloudroam

2024-12-26 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063

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

@@ -198,7 +198,9 @@
                order by fzp.rank asc
            </when>
            <otherwise>
                order by f.price asc
                order by
                    CASE WHEN f.stock = 0 THEN 1  ELSE 0 END,
                f.price asc
            </otherwise>
        </choose>
    </select>