Merge branch 'score_shop' into api_score_meger

jyy

2021-09-03 b687aa0f371e12d4ec1813f18a4f889e8f825f67

 zq-erp/src/main/resources/mybatis/mapper/score/ScoreVipDetailDao.xml

@@ -5,7 +5,7 @@
<mapper namespace="com.matrix.system.score.dao.ScoreVipDetailDao">

    <select id="selectUserTotalScore" resultType="java.lang.Integer">
        select IFNULL(sum(IFNULL( remain_score, 0 )),0) from score_vip_detail
        select IFNULL(sum(IFNULL(remain_score, 0 )),0) from score_vip_detail
        where  state=1 and vip_id=#{vipId}