Merge remote-tracking branch 'origin/master'

k94314517

2024-07-11 a52f8c508d08014d1a153cfc02e12b5fc185a3a4

 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);