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

xuxueyang

2024-09-18 38d8abee8db1034b4cc3fae8613e8328653a1080

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

@@ -33,6 +33,9 @@
                )
            )
        </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'">