From b12e4aff6b46327e0e92c3295a4a04434c2ea4ec Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:32:42 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL_ON/Entity/Room.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 7d39796..f38f8fc 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -50,7 +50,8 @@
public string roomId = "";
public string roomName = "";
- public string roomImage = "";
+ //public string roomImage = "";
+ public string roomImage = "Classification/Room/Roombg.png";
public string roomType = "";
public string parentId = "";
public string uid = Guid.NewGuid().ToString();
@@ -467,7 +468,26 @@
roomType = "ROOM";
roomName = "Room";
}
- public string backgroundImage = "Classification/Room/Roombg.png";
+ //public string backgroundImage = "Classification/Room/Roombg.png";
+ public string backgroundImage
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(roomImage))
+ {
+ return "Classification/Room/Roombg.png";
+ }
+ else
+ {
+ return roomImage;
+ }
+ }
+ set
+ {
+ roomImage = value;
+ }
+ }
+
/// <summary>
/// 妤煎眰
--
Gitblit v1.8.0