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

zxl

昨天 c4786844ef75025cd27cc3833a0f7cd86ad80781

 framework/src/main/java/cn/lili/modules/lmk/domain/query/ActivityQuery.java

@@ -48,5 +48,10 @@
     */
    private String memberId;

    /**
     * 申请互动的店铺id
     */
    private String storeId;


}