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

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopCouponRecordDao.xml

@@ -311,4 +311,8 @@
        </if>
    </select>

    <select id="countUnuseCouponRecord" resultType="java.lang.Integer">
        select  count(*) from shop_coupon_record where user_id = #{userId} and   is_using = 2
    </select>

</mapper>