Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/SysController.cs

@@ -37,6 +37,7 @@ using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using XF.Utility.EnumExtensions;
 using Hotline.Tools;
+using Hotline.Share.Dtos.TrCallCenter;
 
 namespace Hotline.Api.Controllers
 {
@@ -634,10 +635,10 @@ namespace Hotline.Api.Controllers
                 (total, items) = await query.ToPagedListAsync(dto.QueryDto.PageIndex, dto.QueryDto.PageSize, HttpContext.RequestAborted);
             }
 
-            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SystemCommonOpinion>(dto.ColumnInfos);
+            dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SystemCommonOpinionDto>(dto.ColumnInfos);
 
-            var dtos = _mapper.Map<ICollection<SystemCommonOpinion>>(items)
-                              .Select(stu => _mapper.Map(stu, typeof(SystemCommonOpinion), dynamicClass))
+            var dtos = _mapper.Map<ICollection<SystemCommonOpinionDto>>(items)
+                              .Select(stu => _mapper.Map(stu, typeof(SystemCommonOpinionDto), dynamicClass))
                               .Cast<object>()
                               .ToList();
 

src/Hotline.Share/Dtos/Settings/SystemCommonOpinionDto.cs

@@ -0,0 +1,17 @@
+using Hotline.Share.Enums.Settings;
+
+namespace Hotline.Share.Dtos.Settings
+{
+    public class SystemCommonOpinionDto
+    {
+        public string? Content { get; set; }
+        public ECommonType? CommonType { get; set; }
+        public string? CommonTypeText { get; set; }
+        public bool? IsOpen { get; set; }
+        public string? IsOpenText => IsOpen == true ? "公开常用意见" : "个人常用意见";
+        public string? CreatorName { get; set; }
+        public string? CreatorOrgName { get; set; }
+
+        public DateTime? CreationTime { get; set; }
+    }
+}