优化城市数据查询及字段类型处理

在 `GroupsController.cs` 中添加了城市数据查询逻辑，确保只选择有效城市并存储在 `citys` 数组中，提升了代码的清晰性和可维护性。
在 `OrderPreInfoView.cs` 中，将字段类型判断从“下拉选择框”更改为“搜索框”。
在 `GroupOrderPreInfoRepository.cs` 中注释掉了根据备注字段设置 `FieldTypeName` 的条件语句，简化了代码处理方式，确保一致性。

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -424,11 +424,13 @@ namespace OASystem.API.Controllers
             var citys = Array.Empty<string?>();
             if (countryList.Any())
             {
-                citys = await _sqlSugar
+                var cityDatas = await _sqlSugar
                     .Queryable<Grp_NationalTravelFee>()
                     .Where(x => x.IsDel == 0 && countryList.Contains(x.Country) && !string.IsNullOrEmpty(x.City) && !x.City.Contains("城市"))
-                    .Select(x => x.City)
+                    .Select(x => new { x.Country,x.City })
+                    .OrderBy(x => x.Country)
                     .ToArrayAsync();
+                citys = cityDatas.Select(x => x.City).ToArray();
             }
             
             return Ok(JsonView(citys));

OASystem/OASystem.Domain/ViewModels/Groups/OrderPreInfoView.cs

@@ -43,7 +43,7 @@ namespace OASystem.Domain.ViewModels.Groups
             {
                 if (string.IsNullOrEmpty(OriginVal)) return _newValue;
 
-                if (FieldTypeName.Equals("文本") || FieldTypeName.Equals("下拉选择框"))
+                if (FieldTypeName.Equals("文本") || FieldTypeName.Equals("搜索框"))
                 {
                     return OriginVal;
                 }

OASystem/OASystem.Infrastructure/Repositories/Groups/GroupOrderPreInfoRepository.cs

@@ -67,7 +67,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     FieldTempId = ft.Id,
                     FieldName = sd1.Name,
-                    FieldTypeName = sd2.Name,
+                   // FieldTypeName = !string.IsNullOrEmpty(ft.Remark) ? sd2.Name +"-"+ ft.Remark : sd2.Name,
+                    FieldTypeName =  sd2.Name,
                     IsRequired = ft.IsRequired,
                     IsRemark = ft.IsRemark,
                     Index = ft.Index
@@ -112,6 +113,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     ParentId = opi.ParentId,
                     FieldTempId = ft.Id,
                     FieldName = sd1.Name,
+                    //FieldTypeName = !string.IsNullOrEmpty(ft.Remark) ? sd2.Name + "-" + ft.Remark : sd2.Name,
                     FieldTypeName = sd2.Name,
                     OriginVal = opi.Value,
                     IsRequired = ft.IsRequired,