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

zxl

4 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 framework/src/main/java/cn/lili/modules/lmk/enums/general/UserActionPageEnums.java

@@ -15,7 +15,6 @@
    PAY_SUCCESS("支付成功"),
    ORDER_LIST("订单列表"),
    ORDER_DETAIL("订单详情"),
    ACTIVITY("活动"),
    PRIZE_DETAIL("抽奖活动"),
    CART_LIST("购物车"),
    TBA_BAR_MY("我的页面"),