Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-09 8287f743a1ac2fd5330f6dd7ca08255df193ae03

 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>