From 509f2b5d3ee9208ea6b86aae5d29194c654d67f5 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期三, 06 八月 2025 16:59:33 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob --- FlexJobApi.Core/FlexJobApi.Core.xml | 15 +++++++++++++++ FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs | 20 +++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml index 6c75678..17bf11f 100644 --- a/FlexJobApi.Core/FlexJobApi.Core.xml +++ b/FlexJobApi.Core/FlexJobApi.Core.xml @@ -2445,6 +2445,16 @@ 绫诲埆Id </summary> </member> + <member name="P:FlexJobApi.Core.GetDictionaryDatasQueryResultItem.CategoryCode"> + <summary> + 绫诲埆缂栧彿 + </summary> + </member> + <member name="P:FlexJobApi.Core.GetDictionaryDatasQueryResultItem.CategoryName"> + <summary> + 绫诲埆鍚嶇О + </summary> + </member> <member name="P:FlexJobApi.Core.GetDictionaryDatasQueryResultItem.Category"> <summary> 绫诲埆 @@ -2505,6 +2515,11 @@ 鑾峰彇鏁版嵁瀛楀吀鍒嗛〉鍒楄〃鏁版嵁-缁撴灉-琛屾暟鎹�-绫诲埆 </summary> </member> + <member name="P:FlexJobApi.Core.GetDictionaryDatasQueryResultItemCategory.Code"> + <summary> + 绫诲埆缂栧彿 + </summary> + </member> <member name="P:FlexJobApi.Core.GetDictionaryDatasQueryResultItemCategory.Name"> <summary> 鍚嶇О diff --git a/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs b/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs index 2967ec9..4a7af33 100644 --- a/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs +++ b/FlexJobApi.Core/Models/Main/Dictionaries/Queries/GetDictionaryDatasQuery.cs @@ -1,4 +1,5 @@ -锘縰sing MediatR; +锘縰sing Mapster; +using MediatR; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -44,6 +45,18 @@ /// 绫诲埆Id /// </summary> public Guid CategoryId { get; set; } + + /// <summary> + /// 绫诲埆缂栧彿 + /// </summary> + [AdaptIgnore] + public string CategoryCode => Category?.Code; + + /// <summary> + /// 绫诲埆鍚嶇О + /// </summary> + [AdaptIgnore] + public string CategoryName => Category?.Name; /// <summary> /// 绫诲埆 @@ -109,6 +122,11 @@ public class GetDictionaryDatasQueryResultItemCategory { /// <summary> + /// 绫诲埆缂栧彿 + /// </summary> + public string Code { get; set; } + + /// <summary> /// 鍚嶇О /// </summary> public string Name { get; set; } -- Gitblit v1.9.1