From 7fdf7d7bd39cd0381c3969ad6302be0e693cad2d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 02 四月 2024 10:56:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.WebApi/Controllers/UserController.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index da46e1b..7370986 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
@@ -1003,7 +1003,9 @@
user.status,
user.parentId,
user.passWord,
+ user.IsBaifenPromotion,
gradeName = userGrade != null ? userGrade.title : "",
+ gradeKey= userGrade != null ? userGrade.valueKey:"",
userCouponCount,
orderCount,
footPrintCount,
--
Gitblit v1.9.1