From c7118eed256a35aebfc61e343cdfde0216303ad2 Mon Sep 17 00:00:00 2001
From: skx <610262374@qq.com>
Date: Mon, 4 Jan 2021 17:59:22 +0800
Subject: [PATCH] BUG  SqlFunc.IF(xx).Return(1).End(0)  MergeTable

---
 .../SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
index c7ac3ee32..7440185e4 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
@@ -486,6 +486,10 @@ namespace SqlSugar
             {
                 var result = Builder.GetTranslationTableName(EntityName);
                 result += UtilConstants.Space;
+                if (result.Contains("MergeTable") && result.Trim().EndsWith(" MergeTable"))
+                {
+                    TableShortName = null;
+                }
                 if (this.TableShortName.HasValue())
                 {
                     result += (TableShortName + UtilConstants.Space);