Merge branch 'score_shop' into api_score_meger

wzy

2021-09-04 1a9b054b95eb864d1ae7d90d1dfbb497ca1db62a

 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml

@@ -1361,6 +1361,7 @@
        select
               a.ID id,
               a.VIP_NAME vipName,
               a.VIP_NO vipNo,
               a.PHONE phone,
               a.photo photo,
               b.arriveCnt arriveCnt,