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

935090232@qq.com

2022-04-24 14f20daccada2ebe169a45a326e13f4744683716

 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}