diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts
index 80d2e02a..1e59aa87 100644
--- a/src/api/sys/user.ts
+++ b/src/api/sys/user.ts
@@ -385,14 +385,6 @@ export function getShrimpPrices(params, mode: ErrorMessageMode = 'modal') {
   )
 }
 /**
-<<<<<<< HEAD
- * @description:getCropYields
- */
-export function getCropYields(params, mode: ErrorMessageMode = 'modal') {
-  return defHttp.get(
-    {
-      url: `/api/rice-shrimp-prices`,
-=======
  * @description:稻虾价格 - 添加
  */
 export function addShrimpPrices(data, mode: ErrorMessageMode = 'modal') {
@@ -440,7 +432,6 @@ export function getShrimpIndustries(params, mode: ErrorMessageMode = 'modal') {
   return defHttp.get(
     {
       url: `/api/rice-shrimp-industries`,
->>>>>>> 3938cb121abb57822ba7daa68754d32be79f7dce
       params,
     },
     {
@@ -448,8 +439,7 @@ export function getShrimpIndustries(params, mode: ErrorMessageMode = 'modal') {
     },
   )
 }
-<<<<<<< HEAD
-=======
+
 /**
  * @description:稻虾产业 - 添加
  */
@@ -663,4 +653,3 @@ export function deleteCropYields(id: string, mode: ErrorMessageMode = 'modal') {
     },
   )
 }
->>>>>>> 3938cb121abb57822ba7daa68754d32be79f7dce