zhouhui
/
lcny-vue3-antd-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突

new-map
ihzero 2022-11-09 09:35:25 +08:00
parent b028d43582
commit a7a046a71b
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/sys/user.ts
View File

@ -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:稻虾价格 - 添加 * @description:稻虾价格 - 添加
*/ */
export function addShrimpPrices(data, mode: ErrorMessageMode = 'modal') { export function addShrimpPrices(data, mode: ErrorMessageMode = 'modal') {
@ -440,7 +432,6 @@ export function getShrimpIndustries(params, mode: ErrorMessageMode = 'modal') {
return defHttp.get( return defHttp.get(
{ {
url: `/api/rice-shrimp-industries`, url: `/api/rice-shrimp-industries`,
>>>>>>> 3938cb121abb57822ba7daa68754d32be79f7dce
params, params,
}, },
{ {
@ -448,8 +439,7 @@ export function getShrimpIndustries(params, mode: ErrorMessageMode = 'modal') {
}, },
) )
} }
<<<<<<< HEAD
=======
/** /**
* @description:稻虾产业 - 添加 * @description:稻虾产业 - 添加
*/ */
@ -663,4 +653,3 @@ export function deleteCropYields(id: string, mode: ErrorMessageMode = 'modal') {
}, },
) )
} }
>>>>>>> 3938cb121abb57822ba7daa68754d32be79f7dce