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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3366,7 +3366,7 @@ FROM
                     });
 
                     //工作信息
-                    visaDetails.ClientCompany=new()
+                    visaDetails.ClientCompany = new()
                     {
                         CompanyFullName = (string)jsonData.GetType().GetProperty("工作经历雇主")!.GetValue(jsonData)!,
                     };
@@ -3389,7 +3389,7 @@ FROM
             if (compId < 1)
             {
                 _sqlSugar.RollbackTran();
-                return Ok(JsonView(false,"公司信息更新失败！"));
+                return Ok(JsonView(false, "公司信息更新失败！"));
             }
             visaDetails.ClientInfo.CrmCompanyId = compId;
             // 客户资料表
@@ -3448,7 +3448,7 @@ FROM
             #endregion
             #endregion
 
-            return Ok(JsonView(true,jsonString));
+            return Ok(JsonView(true, jsonString));
         }
 
         #region 扩展处理
@@ -3613,9 +3613,9 @@ FROM
             if (parts.Length != 2) return (null, null);
 
             // 3. 解析
-            bool ff = DateTime.TryParse(parts[0].Trim(),out var from);
-            bool tf = DateTime.TryParse(parts[1].Trim(),out var to);
-            
+            bool ff = DateTime.TryParse(parts[0].Trim(), out var from);
+            bool tf = DateTime.TryParse(parts[1].Trim(), out var to);
+
             return (tf ? from : null, tf ? to : null);
         }
 
@@ -3706,7 +3706,7 @@ FROM
         /// </summary>
         /// <param name="raw"></param>
         /// <returns></returns>
-        public static (bool hasService, string branch, string rank, string specialty,(DateTime? start, DateTime? end) period) MilitaryParser(string? raw)
+        public static (bool hasService, string branch, string rank, string specialty, (DateTime? start, DateTime? end) period) MilitaryParser(string? raw)
         {
             const string fmt = "yyyy年MM月dd日";
 
@@ -3740,7 +3740,7 @@ FROM
         /// </summary>
         /// <param name="raw"></param>
         /// <returns></returns>
-        public static (string fatherName, DateTime? fatherDob,string motherName, DateTime? motherDob)ParentParser(string? raw)
+        public static (string fatherName, DateTime? fatherDob, string motherName, DateTime? motherDob) ParentParser(string? raw)
         {
             const string fmt = "yyyy年MM月dd日";
 

OASystem/OASystem.Domain/Entities/Customer/Crm_DeleClient.cs

@@ -666,7 +666,8 @@ namespace OASystem.Domain.Entities.Customer
     }
 
 
-    public class GroupClints {
+    public class GroupClints
+    {
         public int Id { get; set; }
         public string Name { get; set; }
         /// <summary>