From 38e3665144cbabd5d59f876268053e749f046e3a Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 09 九月 2025 09:33:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob

---
 FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs
index ccdd30a..910a179 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetSettlementTaskUsersQuery.cs
@@ -12,17 +12,12 @@
     /// 鏌ヨ缁撶畻鍚嶅崟鍒嗛〉鍒楄〃鏁版嵁
     /// </summary>
     [Resource([EnumResourceController.FlexJobServerTaskUser])]
-    public class GetSettlementTaskUsersQuery : PagedListQuery<GetSettlementTaskUsersQueryResult, GetSettlementTaskUsersQueryResultItem>
+    public class GetSettlementTaskUsersQuery : IRequest<GetSettlementTaskUsersQueryResult>
     {
         /// <summary>
         /// 浠诲姟Id
         /// </summary>
         public Guid TaskInfoId { get; set; }
-
-        /// <summary>
-        /// 鍏抽敭瀛�
-        /// </summary>
-        public string Keywords { get; set; }
 
         /// <summary>
         /// 缁撶畻鍗曞湴鍧�
@@ -33,8 +28,12 @@
     /// <summary>
     /// 鏌ヨ缁撶畻浠诲姟鍒嗛〉鍒楄〃鏁版嵁
     /// </summary>
-    public class GetSettlementTaskUsersQueryResult : PagedListQueryResult<GetSettlementTaskUsersQueryResultItem>
+    public class GetSettlementTaskUsersQueryResult
     {
+        /// <summary>
+        /// 缁撶畻鍚嶅崟
+        /// </summary>
+        public List<GetSettlementTaskUsersQueryResultItem> Data { get; set; }
         /// <summary>
         /// 閿欒淇℃伅
         /// </summary>
@@ -132,6 +131,11 @@
         public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; }
 
         /// <summary>
+        /// 缁撶畻鐘舵��
+        /// </summary>
+        public EnumTaskSettlementStatus? SettlementStatus { get; set; }
+
+        /// <summary>
         /// 鎵�灞為摱琛�
         /// </summary>
         public string Bank { get; set; }

--
Gitblit v1.9.1