Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService

username@email.com

2023-08-31 a161b6f9ad92f645c20fb3b35ad5617490e7f6d2

 DocumentServiceAPI.Application/UserAndLogin/Services/UserService.cs

@@ -120,21 +120,21 @@
                 
             }
              ).WithCache( 10).ToListAsync();
            //不再选择租户
            //var ten = await _db.Queryable<TenantInfo>().Where(x => x.IsEn == true && x.IsDel != true && x.ItCode == ItCode)
            //       .Select(x => new TenderVM
            //       {

            var ten = await _db.Queryable<TenantInfo>().Where(x => x.IsEn == true && x.IsDel != true && x.ItCode == ItCode)
                   .Select(x => new TenderVM
                   {
            //           Description = x.Description,
            //           ItCode = ItCode,
            //           Name = x.Name,
            //           TenderId = x.Id,
            //           IsTender = true

                       Description = x.Description,
                       ItCode = ItCode,
                       Name = x.Name,
                       TenderId = x.Id,
                       IsTender = true

                   }
              ).WithCache(10).ToListAsync()  ;
            ten.AddRange(tentlist);
            return ten;
            //       }
            //  ).WithCache(10).ToListAsync()  ;
            //ten.AddRange(tentlist);
            return tentlist;

        }