From 5f4384bdab4697cc0a678fb17e55603a91a4750b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 四月 2024 08:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

---
 CoreCms.Net.Web.WebApi/Controllers/UserController.cs |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index f72ffd8..7370986 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
@@ -1003,6 +1003,7 @@
                 user.status,
                 user.parentId,
                 user.passWord,
+                user.IsBaifenPromotion,
                 gradeName = userGrade != null ? userGrade.title : "",
                 gradeKey= userGrade != null ? userGrade.valueKey:"",
                 userCouponCount,

--
Gitblit v1.9.1