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

jyy

2021-01-28 83571cf68bc955b8b804d3402331d1ba7f2f4e6c

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

@@ -642,11 +642,11 @@
      COMMISSION_ALL,IN_DATE,STAFF_ID,SHOP_ID,IS_DELETE,REMARK,PASSWORD,
      EMAIL,CREATE_TIME,UUID,BALANCE,blood,sfCard,link,marry,vocation 
        from sys_vip_info 
        where
       instr(PHONE,#{keyWord})
        where company_id=#{companyId}
      and (instr(PHONE,#{keyWord})
         or instr(VIP_NAME ,#{keyWord})
         or instr(zjm ,#{keyWord})
           or instr(VIP_NO ,#{keyWord})
           or instr(VIP_NO ,#{keyWord}))
         limit 0,15
   </select>