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

陶杰

2024-12-25 6f0cee21409ccd21a762fb3a3a46cec06f65b503

 src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml

@@ -69,7 +69,9 @@
            AND oi.station_id = #{dto.stationId}
        </if>
        <if test="dto.flowerCategory != null">
            AND f.category = #{dto.flowerCategory}
            AND ( f.category = #{dto.flowerCategory} or f.category in (
            select id from t_flower_category where parent_id = #{dto.flowerCategory}
            ))
        </if>
        <if test="dto.flowerLevel != null and dto.flowerLevel != ''">
            AND oi.flower_level = #{dto.flowerLevel}