代码合并冲突解决

http/api/market/index.js

@@ -168,12 +168,24 @@ export function shopRechargePost(data) {
 
 /**
  * 智慧充值规/配置信息获取
- * @param {Object} parmas
+ * @param {Object} data
  */
-export function shopRechargeGet(parmas) {
+export function shopRechargeGet(data) {
 	return request({
 		url: `${urlType}/admin/shopRecharge`,
 		method: 'get',
-		parmas
+		data
+	});
+}
+
+/**
+ * 获取店铺用户充值记录
+ * @param {Object} data
+ */
+export function shopUserFlow(data) {
+	return request({
+		url: `/account/admin/shopUser/flow`,
+		method: 'get',
+		data
 	});
 }