Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreMerchantController.java

@@ -73,9 +73,9 @@
    //@PreAuthorize("@el.check('merchant:store:getById')")
    public ResponseEntity<?> getStoreById(@PathVariable Long storeId) {
        Store store = storeService.getById(storeId);
        StoreMerchantView view = new StoreMerchantView();
        BeanUtils.copyProperties(store, view);
        return ResponseEntity.ok(R.success(view));
        /*StoreMerchantView view = new StoreMerchantView();
        BeanUtils.copyProperties(store, view);*/
        return ResponseEntity.ok(R.success(store));
    }

    @GetMapping(value = "/{storeId}/details")