Merge branch 'score_shop' into api_score_meger

Helius

2022-02-14 f2d46a8884e5abfb5635313394083be7afac58a4

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

@@ -317,7 +317,7 @@
         t3.nick_name
      from shop_activities_group_join_user t1
      inner join shop_order t2 on t1.order_id=t2.id
      inner join biz_user t3 on t1.user_id=t3.open_id
      inner join sys_vip_info t3 on t1.user_id=t3.id
      where t1.gj_id=#{gjId}
   </select>