Merge branch 'ty_fix' into alpha

Helius

2021-11-08 15500d265a59ad3b7b7679276a83d9c5c92598dd

 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}