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

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2773,6 +2773,10 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
             List<Sys_SetData> Payment = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 14 && a.IsDel == 0).ToList();
             List<SetDataInfoView> _Payment = _mapper.Map<List<SetDataInfoView>>(Payment);
 
+            //信用卡类型
+            List<Sys_SetData> Card = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 15 && a.IsDel == 0).ToList();
+            List<SetDataInfoView> _Card = _mapper.Map<List<SetDataInfoView>>(Card);
+
             //超支费用类型
             List<Sys_SetData> PriceType = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 79 && a.IsDel == 0).ToList();
             List<SetDataInfoView> _PriceType = _mapper.Map<List<SetDataInfoView>>(PriceType);
@@ -2785,6 +2789,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
             var data = new
             {
                 Payment = _Payment,
+                Card = _Card,
                 PriceType = _PriceType,
                 PriceDetailType = _PriceDetailType
             };