~jiangyouyao/beauty-erp.git

			@@ -642,14 +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
			SHOP_ID=#{shopId}
			and (
			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>

			@@ -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">
			@@ -1320,6 +1317,9 @@
			<if test="record.shopId != null">
			and a.shop_id=#{record.shopId}
			</if>
			<if test="record.companyId != null">
			and a.company_id=#{record.companyId}
			</if>
			<if test='record.birthType=="1"'>
			and a.BIRTHDAY1 between curdate() and DATE_ADD(CURDATE(), INTERVAL 3 DAY)
			</if>
			@@ -1342,6 +1342,9 @@
			<if test="record.sort != 'monthArrived' and record.sort != 'yearArrived'">
			order by ${record.sort} ${record.order}
			</if>
			<if test="record.offset >=0 and record.limit >0">
			limit #{record.offset},#{record.limit}
			</if>
			</select>

			<select id="selectVipInfoById" resultType="com.matrix.system.app.vo.VipInfoVo">