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

935090232@qq.com

2021-10-25 af3cfd97ee2a26e9bef06de009c43df029b4c984

 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,