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

cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml

@@ -45,7 +45,7 @@
                 2
             ), 0
         ) as arrivalRate
-        FROM bk_order
+        FROM bk_order o
         WHERE shop_id = #{shopId}
         <if test="search != null and search != ''">
             AND (o.call_username LIKE CONCAT('%', #{search}, '%')