From 86d7078a77afb507e377ff4f02c14d1dd2defb6e Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 01 四月 2025 16:41:38 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 2 ++
LifePayment/LifePayment.Application/User/AccountService.cs | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 7970135..d509f50 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1239,6 +1239,8 @@
public string ChannlesNum { get; set; }
public Guid ChannlesId { get; set; }
+
+ public LifePaySwitchTypeEnum SwitchType { get; set; }
}
public class BackClientUserInfoOutput
diff --git a/LifePayment/LifePayment.Application/User/AccountService.cs b/LifePayment/LifePayment.Application/User/AccountService.cs
index d65d9fa..936156c 100644
--- a/LifePayment/LifePayment.Application/User/AccountService.cs
+++ b/LifePayment/LifePayment.Application/User/AccountService.cs
@@ -102,7 +102,8 @@
{
Name = s.ChannlesName,
ChannlesId = s.Id,
- ChannlesNum = s.ChannlesNum
+ ChannlesNum = s.ChannlesNum,
+ SwitchType = s.SwitchType,
}).ToListAsync();
BackClientUserInfoOutput result = new BackClientUserInfoOutput()
@@ -162,7 +163,8 @@
{
Name = s.ChannlesName,
ChannlesId = s.Id,
- ChannlesNum = s.ChannlesNum
+ ChannlesNum = s.ChannlesNum,
+ SwitchType = s.SwitchType,
}).ToListAsync();
}
@@ -194,7 +196,8 @@
{
Name = s.ChannlesName,
ChannlesId = s.Id,
- ChannlesNum = s.ChannlesNum
+ ChannlesNum = s.ChannlesNum,
+ SwitchType = s.SwitchType,
}).ToListAsync();
}
--
Gitblit v1.9.1