Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java...

huliguo

9 天以前 7a74745bad7ff20df9e170433c1e1cb851ce7fa9

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java

@@ -489,4 +489,6 @@
     * 一键同步商户信息
     */
    R updateShopByOneClinkSyncing(OneClinkSyncing oneClinkSyncing);

    List<String> getRelUserShop(Long userId);
}