Merge branch 'send_coupon' into user_action

peng

2 天以前 e4dd7447aaa4563b9e64a7556710677a140776eb

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

@@ -13,6 +13,7 @@
        <result column="user_id" property="userId" />
        <result column="nick_name" property="nickName" />
        <result column="claim_status" property="claimStatus" />
        <result column="material" property="material"/>
    </resultMap>


@@ -49,11 +50,15 @@
            LPCR.user_id,
            LPCR.nick_name,
            LPCR.claim_status,
            LPCR.material,
            LPCR.id
        FROM
            lmk_prize_claim_record LPCR
        WHERE
            LPCR.delete_flag = 0
        <if test="query.storePrizeId !=null and query.storePrizeId !=''">
            AND LPCR.store_prize_id = #{query.storePrizeId}
        </if>
    </select>

</mapper>