Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-28 11b718b78ee92d2349072c972e7155001693d69e

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml

@@ -40,6 +40,7 @@
                <choose>
                    <when test="query.tagType == 2">
                        AND toe.img_url IS NOT NULL
                        AND toe.img_url != ''
                    </when>
                    <when test="query.tagType == 3">
                        AND toe.mark &gt;= 4