Merge remote-tracking branch 'origin/master'

CeDo

2021-04-22 be2d7ec232fbd22b5e46ec133485ea751520636d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -2086,6 +2086,13 @@
    R getUserStoreInfo(@RequestParam("userId") Long userId);

    /**
     * 获取用户商户详情
     * @param account 用户账号
     */
    @GetMapping("/shop/getUserStoreInfoByAccount")
    R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);

    /**
     * 订单导出信息
     * @param comShopOrderExportDTO 订单导出信息
     * @return  订单导出信息