Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-26 992f5853fb625be015fa28e9a0154278b2ed41a2

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

@@ -643,13 +643,10 @@
      EMAIL,CREATE_TIME,UUID,BALANCE,blood,sfCard,link,marry,vocation 
        from sys_vip_info 
        where
        SHOP_ID=#{shopId}
       and  (
       instr(PHONE,#{keyWord})
         or instr(VIP_NAME ,#{keyWord})
         or instr(zjm ,#{keyWord})
           or instr(VIP_NO ,#{keyWord})
       )
         limit 0,15
   </select>

@@ -674,7 +671,7 @@
        and
        (a.VIP_NO =#{key} or
        a.VIP_NAME =#{key} or
        a.PHONE =#{key}) and a.shop_id=#{shopId}
        a.PHONE =#{key})
    </select>

    <select id="getLevelIdByMoney" resultMap="SysVipInfoMap">