Merge branch 'feature-dgy-运营中心过期' into feature-dgy-后台测试

# Conflicts:
#	Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -139,11 +139,11 @@ namespace MySystem.Areas.Admin.Controllers
                 //所属人信息
                 int Id = int.Parse(dic["Id"].ToString());
                 SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new SysAdmin();
-                // var dic["ExpiredStatus"] = 0; // 是否过期(0 未过期 1 已过期)
-                // if (sysAdmin.ExpiredDate < DateTimeConstantAttribute.Now)
-                // {
-                //     dic["ExpiredStatus"] = 1;
-                // }
+                dic["ExpiredStatus"] = "未过期"; // 是否过期(0 未过期 1 已过期)
+                if (sysAdmin.ExpireDate < DateTime.Now)
+                {
+                    dic["ExpiredStatus"] = "已过期";
+                }
                 var userInfo = db.Users.FirstOrDefault(m => m.Id == sysAdmin.UserId) ?? new Models.Users();
                 if (userInfo.UserType == 0) dic["Kind"] = "";
                 if (userInfo.UserType == 1) dic["Kind"] = "运营中心";
@@ -704,7 +704,10 @@ namespace MySystem.Areas.Admin.Controllers
 
                 RedisDbconn.Instance.AddList("OperateAmountRecordServiceQueue", opAmountItem);
                 AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
+<<<<<<< HEAD
                 opdb.SaveChanges();
+=======
+>>>>>>> feature-dgy-运营中心过期
 
                 if (Kind == 2 && ReturnFlag == 1)
                 {