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

peng

3 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

 framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java

@@ -59,7 +59,7 @@
    public Result add(StoreMemberForm form) {
       String storeId =UserContext.getCurrentUser().getStoreId();
        System.out.println(storeId);
//        storeId = "1376433565247471616"; //测试用
        //
        if ( storeId == null){
            return null;
        }