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 | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
index 1a8d88b..7370986 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs
@@ -1,7 +1,7 @@
锘�/***********************************************************************
- * Project: CoreCms
+ * Project: baifenBinfa
* ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
- * Web: hhtp://chuanyin.com
+ * Web: http://chuanyin.com
* Author:
* Email:
* CreateTime: 202403/02
@@ -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