Browse Source

Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

leiy 1 year ago
parent
commit
fdda9e0ce5

File diff suppressed because it is too large
+ 883 - 150
OASystem/OASystem.Api/Controllers/GroupsController.cs


+ 8 - 0
OASystem/OASystem.Domain/Dtos/Groups/GroupCostSavaDto.cs

@@ -797,12 +797,15 @@ namespace OASystem.Domain.Dtos.Groups
     public class GroupCostExportExcelFile
     {
         public int Diid { get; set; }
+        public string costType { get; set; }
 
         public titleChunk title { get; set; }
 
         public List<LeftModel> leftInfo { get; set; }
 
         public List<RightModel> rightInfo { get; set; }
+
+        public List<TitleModel> titleModel { get; set; }
     }
 
     public class LeftModel
@@ -818,6 +821,11 @@ namespace OASystem.Domain.Dtos.Groups
 
         public List<RightInfoModel> rightInfoNumber { get; set; }
     }
+    public class TitleModel
+    {
+        public string label { get; set; }
+        public string text { get; set; }
+    }
 
     public class RightInfoModel
     {