This commit is contained in:
lr 2025-02-18 11:43:39 +08:00
parent 5612f07709
commit 8eb011d332
1 changed files with 2 additions and 4 deletions

View File

@ -73,7 +73,6 @@ export const durian = {
load: true, load: true,
}) })
}, },
<<<<<<< HEAD
/** /**
* 榴莲果配置 * 榴莲果配置
* @param {Object} param * @param {Object} param
@ -82,8 +81,8 @@ export const durian = {
return util.request({ return util.request({
url: `/coreplay/durianFruitTransactionType/10`, url: `/coreplay/durianFruitTransactionType/10`,
method: 'GET', method: 'GET',
======= })
},
/** /**
* 获取榴莲果兑换播放量比例 * 获取榴莲果兑换播放量比例
* @param {Object} param * @param {Object} param
@ -93,7 +92,6 @@ export const durian = {
url: `/coreplay/durianFruitTransactionType/5`, url: `/coreplay/durianFruitTransactionType/5`,
method: 'GET', method: 'GET',
data: param.data, data: param.data,
>>>>>>> e13df4169078e5739567f80dd1d8caae214e4c7f
}) })
}, },
} }