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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

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

@@ -33,6 +33,19 @@
                )
            )
        </if>
        <if test="condition.supplierName != null and condition.supplierName != ''">
            AND s.name LIKE concat('%', #{condition.supplierName},'%')
        </if>
        <if test="condition.isFee != null">
            <choose>
                <when test="condition.isFee == 'markup'">
                    AND sp.fee > 0
                </when>
                <otherwise>
                    AND (sp.fee is null or sp.fee = 0)
                </otherwise>
            </choose>
        </if>
        ORDER BY f.id
    </select>