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

huliguo

6 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/ShopFileService.java

@@ -27,4 +27,10 @@
     * @param shopId
     */
    void deleteByShopId(Long shopId);

    /**
     * 通过商户ids批量删除关联
     * @param shopIdList
     */
    void deleteBatchByShopIds(List<Long> shopIdList);
}