Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-25 819e873f7e5141f2bcb6979fb6637864b950da5b

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

@@ -348,7 +348,6 @@
      from money_card_use_flow
      <where>
            and car_use_id=#{record.carUseId}

         <if test="record.queryTime!=null and record.queryTime!=''">
            and DATE_FORMAT(create_time,'%Y-%m')=#{record.queryTime}
         </if>