合并冲突到dev

src/api/product/findColor.ts

@@ -7,5 +7,6 @@ export const FindColorListApi = () => {
   return useRequest({
     url: `/v1/mp/product/color/absorb/match`,
     method: 'get',
+    pagination: true
   })
 }

src/api/product/product.ts

@@ -3,7 +3,7 @@ import { useRequest } from '@/use/useHttp'
 //取色对比
 export const productabsorbcontrast = () => {
   return useRequest({
-    url: `/v1/mall/product/color/absorb/contrast`,
+    url: `/v1/mp/product/color/absorb/contrast`,
     method: 'get',
   })
 }