Merge remote-tracking branch 'origin/master'

jiangping

2024-07-11 7edd684a977341e8394a7b5b4c04069cce0442e8

 server/service/src/main/java/com/doumee/service/business/ShopService.java

@@ -102,6 +102,7 @@
    List<ShopTreeVo> shopTreeCache(Integer type);
    List<ShopTreeVo> shopTree(Integer type);
    String importFcodeBatch(MultipartFile file);
    String importCategoryBatch(MultipartFile file);
    void updateSort(UpdateShopSortDTO dto);

    String importBatch(MultipartFile file);