merge from 2023-03-14

2023-03-24 09:37:07 +08:00
parent f95ef4cf73
commit 3de92dab06
57 changed files with 1538 additions and 528 deletions
--- a/extend/Tnb.Extend/ProductClassifyService.cs
+++ b/extend/Tnb.Extend/ProductClassifyService.cs
@@ -59,7 +59,7 @@ public class ProductClassifyService : IDynamicApiController, ITransient
    [HttpGet("{id}")]
    public async Task<dynamic> GetInfo(string id)
    {
-        return (await _repository.AsQueryable().FirstAsync(a => a.Id.Equals(id))).Adapt<ProductClassifyInfoOutput>();
+        return (await _repository.AsQueryable().FirstAsync(a => a.Id.Equals(id) && a.DeleteMark == null)).Adapt<ProductClassifyInfoOutput>();
    }

    #endregion