Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

 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>