From 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:48:35 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL_ON/DAL/Server/IMessageCommon.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index 728205d..2564a72 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -243,7 +243,7 @@
/// <param name="statuCode"></param>
/// <param name="isTipStyle"></param>
/// <param name="tipStr">琛ュ厖鐨勯敊璇彁绀�</param>
- public void ShowErrorInfoAlter(string statuCode, bool isTipStyle = true, int closeTime = 2, string tipStr = "")
+ public void ShowErrorInfoAlter(string statuCode, bool isTipStyle = true, int closeTime = 2, string tipStr = "",bool showAllMsg = true)
{
try
{
@@ -258,7 +258,13 @@
if (mes == null) return;
if (!string.IsNullOrEmpty(tipStr))
{
- mes = tipStr + "\n" + mes;
+ if (showAllMsg)
+ {
+ mes = tipStr + "\n" + mes;
+ }else
+ {
+ mes = tipStr;
+ }
}
if (isTipStyle)
{
--
Gitblit v1.8.0