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

JiangYouYao

2022-03-15 9c5d7547fa9b37c09659c90448ade6df6db4f2de

 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}