# 更新

src/main/java/com/gogirl/application/product/serve/impl/BaseServeServiceImpl.java

@@ -30,7 +30,7 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
         param.setDepartmentId(departmentId);
 
 
-        IPage<BaseServe> result = baseServeMapper.listServeForPage(page, param,SessionUtils.getSourceFrom());
+        IPage<BaseServe> result = baseServeMapper.listServeForPage(page, param, SessionUtils.getSourceFrom());
         List<Integer> serveIdList = result.getRecords().stream().map(BaseServe::getId).collect(Collectors.toList());
 
 
@@ -39,7 +39,7 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
                 .in(ServiceStorePrice::getServiceId, serveIdList));
 
         Map<Integer, ServiceStorePrice> map = serviceStorePriceList.stream()
-                .collect(Collectors.toMap(ServiceStorePrice::getServiceId, serviceStorePrice -> serviceStorePrice));
+                .collect(Collectors.toMap(ServiceStorePrice::getServiceId, serviceStorePrice -> serviceStorePrice, (o1, o2) -> o1));
 
         result.getRecords().forEach(baseServe -> {
             ServiceStorePrice serviceStorePrice = map.get(baseServe.getId());