Merge remote-tracking branch 'origin/alice'

# Conflicts:
#	Merchant Token Vault Management/backstage/wwwroot/css/style.css

Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml

@@ -181,6 +181,9 @@
 	<div class="container-fluid page-body-wrapper">
 		<!-- partial:./partials/_sidebar.html -->
 		<nav class="sidebar sidebar-offcanvas" id="sidebar">
+			<div class="versionNo">
+				版本: v1.23
+			</div>
 			<ul class="nav ">
 				<li class="nav-item">
 					<a class="nav-link" data-toggle="collapse" href="#Member" aria-expanded="false" aria-controls="Member">

Merchant Token Vault Management/backstage/Views/TokenVault/List.cshtml

@@ -3,7 +3,7 @@
 	ViewData["Title"] = "TokenVault列表管理";
 }
 @{
-	bool isAdmin = User.IsInRole("admin");
+	bool isAdmin = User.IsInRole("Admin");
 	string disabledClass = isAdmin ? "" : "disabled";
 }
 

Merchant Token Vault Management/backstage/Views/TokenVault/ListFields.cshtml

@@ -3,7 +3,7 @@
 	ViewData["Title"] = "Fields列表管理";
 }
 @{
-	bool isAdmin = User.IsInRole("admin");
+	bool isAdmin = User.IsInRole("Admin");
 	string disabledClass = isAdmin ? "" : "disabled";
 }
 @section header{

Merchant Token Vault Management/backstage/Views/TokenVault/ListMasks.cshtml

@@ -3,7 +3,7 @@
 	ViewData["Title"] = "Mask列表管理";
 }
 @{
-	bool isAdmin = User.IsInRole("admin");
+	bool isAdmin = User.IsInRole("Admin");
 	string disabledClass = isAdmin ? "" : "disabled";
 }
 

Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml

@@ -3,7 +3,7 @@
 	ViewData["Title"] = "欄位Users列表管理";
 }
 @{
-	bool isAdmin = User.IsInRole("admin");
+	bool isAdmin = User.IsInRole("Admin");
 	string disabledClass = isAdmin ? "" : "disabled";
 }
 

Merchant Token Vault Management/backstage/Views/User/ListUsers.cshtml

 @model backstage.Models.Users.UserResponse
 @{
-	bool isAdmin = User.IsInRole("admin");
+	bool isAdmin = User.IsInRole("Admin");
 	string disabledClass = isAdmin ? "" : "disabled";
 }
 <div class="page-header">

Merchant Token Vault Management/backstage/wwwroot/css/style.css

@@ -19275,6 +19275,18 @@ tbody {
 }
 
 
+
+
+/*版本號樣式*/
+.versionNo {
+    color: #f2f2f2;
+    font-size: 0.825rem;
+    padding: 20px 16px 10px 16px
+}
+
+}
+
+
 .floating-msg {
     position: fixed;
     top: 80px;