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

zxl

3 天以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

 framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java

@@ -360,4 +360,6 @@
     * @return
     */
    Result getOrderCount(StatisticsQueryParam queryParam);

    Result getOrderTimePeriod(StatisticsQueryParam queryParam);
}