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

zxl

3 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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

@@ -59,6 +59,9 @@
        <if test="query.storePrizeId !=null and query.storePrizeId !=''">
            AND LPCR.store_prize_id = #{query.storePrizeId}
        </if>
        <if test="query.storeId !=null and query.storeId !=''">
            AND LPCR.store_id = #{query.storeId}
        </if>
    </select>

</mapper>