From ecf7e9c83e733408f22fa3ca9a79d04029728721 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 10:18:19 +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/User/UserRoleService.cs | 2 +-
LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
index 0a0d905..02bb938 100644
--- a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
@@ -249,7 +249,7 @@
/// <summary>
/// 娓犻亾Id
/// </summary>
- public string Id { get; set; }
+ public Guid Id { get; set; }
/// <summary>
/// 娓犻亾鍚�
diff --git a/LifePayment/LifePayment.Application/User/UserRoleService.cs b/LifePayment/LifePayment.Application/User/UserRoleService.cs
index e8239f5..3d3e22f 100644
--- a/LifePayment/LifePayment.Application/User/UserRoleService.cs
+++ b/LifePayment/LifePayment.Application/User/UserRoleService.cs
@@ -62,7 +62,7 @@
from c in _channleRepository.Where(s => s.ChannlesNum == uc.ChannleId)
select new UserChannleDto
{
- Id = c.ChannlesNum,
+ Id = c.Id,
Name = c.ChannlesName,
},
Remark = u.Remark,
--
Gitblit v1.9.1