Merge branch 'score_shop' into api_score_meger

jyy

2022-01-23 c381ee31e4bc8c186878ac0178164f3604516783

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopRevenueFlowDao.xml

@@ -33,7 +33,7 @@
   </resultMap>


    <select id="selectRevenuFlowList" resultType="com.matrix.system.shopXcx.vo.SalesOrderVo">
    <select id="selectRevenuFlowList" resultType="com.matrix.system.fenxiao.entity.ShopRevenueFlow">
      select * from shop_revenue_flow
      where user_id=#{record.userId}
        and DATE_FORMAT(create_time,'%Y-%m')=#{record.queryTime}