页面修改

Edu.Aop/obj/Debug/netcoreapp3.0/Edu.Aop.AssemblyInfo.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-
-[assembly: System.Reflection.AssemblyCompanyAttribute("Edu.Aop")]
-[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-[assembly: System.Reflection.AssemblyProductAttribute("Edu.Aop")]
-[assembly: System.Reflection.AssemblyTitleAttribute("Edu.Aop")]
-[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-
-// 由 MSBuild WriteCodeFragment 类生成。
-

Edu.Aop/obj/Debug/netcoreapp3.0/Edu.Aop.AssemblyInfoInputs.cache

-a4bc18e0d97e2d303aee861cb6dd1d3eb063f98d

Edu.Cache/obj/Debug/netcoreapp3.0/Edu.Cache.AssemblyInfo.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-
-[assembly: System.Reflection.AssemblyCompanyAttribute("Edu.Cache")]
-[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-[assembly: System.Reflection.AssemblyProductAttribute("Edu.Cache")]
-[assembly: System.Reflection.AssemblyTitleAttribute("Edu.Cache")]
-[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-
-// 由 MSBuild WriteCodeFragment 类生成。
-

Edu.Cache/obj/Debug/netcoreapp3.0/Edu.Cache.AssemblyInfoInputs.cache

-0c2350303349e2db3610a5ffcc8afae90524b4fa

Edu.Common/obj/Debug/netcoreapp3.0/Edu.Common.AssemblyInfo.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-
-[assembly: System.Reflection.AssemblyCompanyAttribute("Edu.Common")]
-[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-[assembly: System.Reflection.AssemblyProductAttribute("Edu.Common")]
-[assembly: System.Reflection.AssemblyTitleAttribute("Edu.Common")]
-[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-
-// 由 MSBuild WriteCodeFragment 类生成。
-

Edu.Common/obj/Debug/netcoreapp3.0/Edu.Common.AssemblyInfoInputs.cache

-67b30fdcc89ac0cfaac2325a8b04b5592d893c93

Edu.Model/ViewModel/DataStatistics/StudentFollowStatic.cs

@@ -109,6 +109,11 @@ namespace Edu.Model.ViewModel.DataStatistics
 
         public object FollowList { get; set; }
 
+        /// <summary>
+        /// 是否显示所有根据(前端使用)
+        /// </summary>
+        public bool IsShowFollowAll { get; set; }
+
         /// <summary>
         /// 续费订单
         /// </summary>

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -233,6 +233,8 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public int IsRenewGuest { get; set; }
 
+
+
         /// 协助人员
         /// </summary>
         public List<RB_Student_Assist_Extend> AssistList { get; set; }

Edu.Model/obj/Debug/netcoreapp3.0/Edu.Model.AssemblyInfo.cs

-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-
-[assembly: System.Reflection.AssemblyCompanyAttribute("Edu.Model")]
-[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-[assembly: System.Reflection.AssemblyProductAttribute("Edu.Model")]
-[assembly: System.Reflection.AssemblyTitleAttribute("Edu.Model")]
-[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-
-// 由 MSBuild WriteCodeFragment 类生成。
-

Edu.Model/obj/Debug/netcoreapp3.0/Edu.Model.AssemblyInfoInputs.cache

-32c73bdd47611a75ebde0f032c85cdb24a1f3c93

Edu.Module.User/StudentStatModule.cs

@@ -395,7 +395,8 @@ namespace Edu.Module.User
                         AssistList = item.AssistList,
                         CreateByName = item.CreateByName,
                         RenewOrderList = xlist?.Where(x => x.StuId == item.StuId)?.Select(x => new { x.CourseName, x.CourseRate, CourseRateName = x.CourseRate > 0 ? Common.Plugin.EnumHelper.ToName((CourseRateEnum)x.CourseRate) : "", x.PreferPrice }),
-                        FollowList = item.FollowList?.Select(x => new { x.Remark, CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") }),
+                        FollowList = item.FollowList?.Select(x => new { Remark = Common.Plugin.StringHelper.FilterHtml(x.Remark), CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") }),
+                        IsShowFollowAll = false,
                     };
                     RList.Add(followModel);
                 }

Edu.Repository/obj/Debug/netcoreapp3.0/Edu.Repository.AssemblyInfoInputs.cache

-06d7e9a762b0ad4dcb0df09e38f6942167f188dbf481acb8b4898ac74af6bacd