From fd3e97754de475f094fb59c83b3a469c9004ad3b Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 01 四月 2025 15:41:14 +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/User/CreateBackClientUserInput.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
index d1f3f9e..ae5bc76 100644
--- a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
@@ -1,5 +1,7 @@
-锘縰sing System;
+锘縰sing LifePayment.Domain.Shared;
+using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using ZeroD.Util;
namespace LifePayment.Application.Contracts
@@ -17,8 +19,14 @@
public string PhoneNumber { get; set; }
/// <summary>
+ /// 瀵嗙爜
+ /// </summary>
+ public string Password { get; set; }
+
+ /// <summary>
/// 璐︽埛
/// </summary>
+ //[RegularExpression(LifePaymentConstant.RegularExpression.UserNameEx, ErrorMessage = "璐﹀彿鏍煎紡涓嶆纭�")]
public string UserName { get; set; }
public string Remark { get; set; }
@@ -27,6 +35,11 @@
/// 瑙掕壊
/// </summary>
public string[] RoleNames { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鍒楄〃
+ /// </summary>
+ public string[] ChannlesId { get; set; }
/// <summary>
/// 缁勭粐鏋舵瀯鍏徃id
@@ -73,6 +86,16 @@
/// 澶囨敞
/// </summary>
public string Remark { get; set; }
+ }
+
+ /// <summary>
+ /// 閲嶇疆瀵嗙爜鍩虹杈撳叆鍙傛暟
+ /// </summary>
+ public class ResetPasswordBaseInput
+ {
+ public Guid UserId { get; set; }
+
+ public string? Password { get; set; }
}
public class UpdateBackClientUserInput : CreateBackClientUserInput
@@ -130,6 +153,12 @@
/// 瑙掕壊淇℃伅
/// </summary>
public IEnumerable<RoleDto> Roles { get; set; }
+
+
+ /// <summary>
+ /// 瑙掕壊淇℃伅
+ /// </summary>
+ public IEnumerable<UserChannleDto> Channles { get; set; }
/// <summary>
/// 澶囨敞
@@ -215,6 +244,24 @@
public string Remark { get; set; }
}
+ public class UserChannleDto
+ {
+ /// <summary>
+ /// 娓犻亾Id
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 娓犻亾num
+ /// </summary>
+ public string ChannlesNum { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鍚�
+ /// </summary>
+ public string Name { get; set; }
+ }
+
public class GetRolesInput : PageInput
{
/// <summary>
--
Gitblit v1.9.1