Merge remote-tracking branch 'origin/dev' into dev

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

 framework/src/main/resources/mapper/lmk/PrizeDrawMapper.xml

@@ -51,6 +51,12 @@
            lmk_prize_draw LPD
        WHERE
            LPD.delete_flag = 0
        <if test="query.prizeName != null and query.prizeName != ''">
            AND LPD.prize_name like concat('%',#{query.prizeName},'%')
        </if>
        <if test="query.prizeType != null and query.prizeType != ''">
            AND LPD.prize_type = #{query.prizeType}
        </if>
    </select>

</mapper>