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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 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>