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

peng

4 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

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

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

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


}