Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-01-24 6d78f8ab222498d727e91983d0511d8119d95aa3

 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>
@@ -361,6 +360,12 @@
      </where>
      order by  create_time desc
   </select>

   <update id="updateVipCardId">
      update money_card_use_flow
         set car_use_id=#{cardId}
      where vip_id=#{vipId} and type='会员充值'
   </update>
</mapper>