Merge remote-tracking branch 'origin/master'

cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml

@@ -60,17 +60,13 @@
         pro.id as proId,
         inRecord.name as name,
         inRecord.type,
-        inRecord.over_num as num,
         inRecord.use_end_time as endTime
         FROM
         tb_shop_activate_coupon_record inRecord
         LEFT JOIN tb_shop_info shop ON inRecord.shop_id = shop.id
         LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id and pro.shop_id = #{shopId}
         WHERE
-        inRecord.shop_user_id in
-        <foreach item="item" index="index" collection="vipUserIds" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        inRecord.shop_user_id = #{shopUserId}
         <if test="shopId != null and shopId != ''">
             and inRecord.shop_id = #{shopId}
         </if>