Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-15 269985404f94b50d14099b83f3436d6d405c365d

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

@@ -328,9 +328,7 @@
         <if test="record.vipId != null and record.vipId !='' ">
            and a.VIP_ID   = #{record.vipId}
         </if>
         <if test="record.isOverTime != null  and record.serviceNo !=''   ">
            and a.IS_OVERTIME  > #{record.isOverTime}
         </if>

         <if test="record.serviceNo != null and record.serviceNo !='' ">
            and a.SERVICE_NO  like CONCAT('%',#{record.serviceNo},'%')
         </if>