1

b82a7b36 · liudong1993 · 90111eb5 · b82a7b36
Commit b82a7b36 authored May 27, 2020 by liudong1993
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

RB_Goods_Order_Extend.cs Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs +0 -1

No files found.
--- a/Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
+++ b/Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
@@ -172,7 +172,6 @@ namespace Mall.Model.Extend.Product
        public string DName { get; set; }

        #endregion
->>>>>>> 61e2df8d6e7f6e7b0ef4482885c6e6b79d1870e7
    }

    /// <summary>