From c7e7901305b9c2182a1faf52eb2bdc0481468e10 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 28 八月 2024 21:23:42 +0800
Subject: [PATCH] 优化条码规则,增加固定值可以设置为不包含;增加流水号取号支持设置取号间隔和跳号规则

---
 Tiger.Api/Controllers/Base/SystemController.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Tiger.Api/Controllers/Base/SystemController.cs b/Tiger.Api/Controllers/Base/SystemController.cs
index 4a5025a..5e506d3 100644
--- a/Tiger.Api/Controllers/Base/SystemController.cs
+++ b/Tiger.Api/Controllers/Base/SystemController.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using Tiger.Model;
 using System.Xml.Linq;
+using System.ComponentModel;
 
 namespace Tiger.Api.Controllers.Base
 {
@@ -119,7 +120,11 @@
                     q.FullName,
                     q.Namespace,
                     q.Name,
-                    Properties = q.GetProperties().Select(p => new { p.Name, Type = p.PropertyType.Name }).ToList()
+                    DisplayName = (q.GetCustomAttribute(typeof(DisplayNameAttribute)) as DisplayNameAttribute)?.DisplayName,
+                    Properties = q.GetProperties().Select(p => new { 
+                        p.Name, 
+                        DisplayName = (p.GetCustomAttribute(typeof(DisplayNameAttribute)) as DisplayNameAttribute)?.DisplayName,
+                        Type = p.PropertyType.Name }).ToList()
                 })
             };
             return Ok(data);

--
Gitblit v1.9.3