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

peng

7 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

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

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

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


}