feat:merchant

service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java

@@ -556,7 +556,7 @@ public class MerchantConvert {
       List<String> studioNames = studioMap.getOrDefault(brandId, new ArrayList<>()).stream()
           .map(StudioVO::getName).collect(Collectors.toList());
       return convertBrandMerchant(brandId, studioNames, e, dto, applyMap.get(e.getId()));
-    }).sorted(Comparator.comparing(BrandMerchantVO::getFinishTime)).collect(Collectors.toList());
+    }).sorted((o1, o2) -> o2.getFinishTime().compareTo(o1.getFinishTime())).collect(Collectors.toList());
   }
 
   public static StudioMerchantApply convertBindApply(Long studioId, StudioMerchantApply apply) {