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

jyy

2021-03-12 b12efd16399d217756bf71b92d88b29bd4781295

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

@@ -46,7 +46,7 @@
               shop_salesman_order b
            WHERE
               b.user_id = a.open_id
              and order_status=1
              and order_status=2
              AND b.sales_user_id = #{openId}

         ) AS revenueAmount,