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

姜友瑶

2022-05-17 830b2eb4e8b7eef6e73fe65cde5331d914c28786

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

@@ -354,7 +354,7 @@
       left join  sys_vip_info c on a.vip_id=c.id
      <where>
         and a.company_id=#{companyId}

         and (c.IS_DELETE is null or c.IS_DELETE = '')
         <if test="shopId != null ">
            and a.shop_id=#{shopId}
         </if>