Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

 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>