diff --git a/OpenAuth.App/Resources/ResourceApp.cs b/OpenAuth.App/Resources/ResourceApp.cs
index 2f15c555..55809f14 100644
--- a/OpenAuth.App/Resources/ResourceApp.cs
+++ b/OpenAuth.App/Resources/ResourceApp.cs
@@ -85,10 +85,7 @@ namespace OpenAuth.App
             }
 
             var columnnames = columnFields.Select(u => u.ColumnName);
-            if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
-            {
-                columnnames = columnFields.Select(u => "\"" + u.ColumnName +"\"");
-            }
+            
             var propertyStr = string.Join(',', columnnames);
             result.columnFields = columnFields;
             result.data = resources.OrderBy(u => u.TypeId)
diff --git a/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs b/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
index 30528d7b..81ceb6e3 100644
--- a/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
+++ b/OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using Infrastructure;
 using OpenAuth.App.Interface;
@@ -41,10 +40,7 @@ namespace OpenAuth.App
             }
 
             var columnnames = columnFields.Select(u => u.ColumnName);
-            if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
-            {
-                columnnames = columnFields.Select(u => "\"" + u.ColumnName +"\"");
-            }
+           
             var propertyStr = string.Join(',', columnnames);
             result.columnFields = columnFields;
             result.data = objs.OrderByDescending(u => u.CreateTime)
diff --git a/OpenAuth.App/Test/TestBase.cs b/OpenAuth.App/Test/TestBase.cs
index d9ad8448..0614968d 100644
--- a/OpenAuth.App/Test/TestBase.cs
+++ b/OpenAuth.App/Test/TestBase.cs
@@ -77,12 +77,7 @@ namespace OpenAuth.App.Test
                 {
                     DbType = dbType.Value,
                     ConnectionString = connectionString,
-                    IsAutoCloseConnection = true,
-                    MoreSettings=new ConnMoreSettings() { 
-                        PgSqlIsAutoToLower = false,//增删查改支持驼峰表
-                        PgSqlIsAutoToLowerCodeFirst = false, // 建表建驼峰表。5.1.3.30 
-                        IsAutoToUpper=false //禁用自动转成大写表
-                    }
+                    IsAutoCloseConnection = true
                 });
                 return sqlSugar;
             });
diff --git a/OpenAuth.Mvc/Startup.cs b/OpenAuth.Mvc/Startup.cs
index b8d2684b..45576afb 100644
--- a/OpenAuth.Mvc/Startup.cs
+++ b/OpenAuth.Mvc/Startup.cs
@@ -109,11 +109,7 @@ namespace OpenAuth.Mvc
                 {
                     DbType = dbType.Value,
                     ConnectionString = connectionString,
-                    IsAutoCloseConnection = true,
-                    MoreSettings=new ConnMoreSettings() { 
-                        PgSqlIsAutoToLower = false,//增删查改支持驼峰表
-                        PgSqlIsAutoToLowerCodeFirst = false // 建表建驼峰表。5.1.3.30 
-                    }
+                    IsAutoCloseConnection = true
                 }, db => { db.Aop.OnLogExecuting = (sql, pars) => { logger.LogInformation(sql); }; });
                 return sqlSugar;
             });
diff --git a/OpenAuth.Mvc/Views/Home/Main.cshtml b/OpenAuth.Mvc/Views/Home/Main.cshtml
index 6322c77f..f2b10b2b 100644
--- a/OpenAuth.Mvc/Views/Home/Main.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Main.cshtml
@@ -18,7 +18,7 @@
     <div class="panel col">
         <a href="javascript:;" data-url="/Rolemanager/index">
             <div class="panel_icon" style="background-color:#FF5722;">
-                 <i class="layui-icon layui-icon-vercode" ></i>
+                <i class="layui-icon layui-icon-vercode" ></i>
             </div>
             <div class="panel_word roles">
                 <span></span>
@@ -75,14 +75,14 @@
     <p>官方博客：<a href="http://www.cnblogs.com/yubaolee/">http://www.cnblogs.com/yubaolee/</a> </p>
     <p>
         系统默认System账号登录，可以查看所有权限，如果用其他账号（如：admin/test）可以查看相应的授权/可见字段情况。
-        数据库密码明文存储，不要问为什么不加密，因为你要问这些账号的密码我也记不住啊O(∩_∩)O
     </p>
     <p>
         <a href="https://gitee.com/dotnetchina/OpenAuth.Net" target="_blank" class="layui-btn layui-btn-xs layui-btn-danger">项目地址</a>
         <a class="layui-btn layui-btn-xs" target="_blank" href="http://doc.openauth.net.cn">在线文档</a>
-        <a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1803">企业版/高级版入口</a>
+        <a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1803">企业Vue2演示</a>
+        <a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1805">企业Vue3演示</a>
         <a class="layui-btn layui-btn-xs layui-btn-danger" target="_blank" href="http://demo.openauth.net.cn:1804">企业版H5入口（请使用移动模式或者直接手机查看）</a>
-        <span style="color: #f00;">注：【本框架遵循LGPL开源协议，企业单位如商用请联系作者授权，谢谢】</span>
+        <span style="color: #f00;">注：【本框架遵循Apache开源协议，可以免费商用】</span>
     </p>
     <p>技术交流QQ群：484498493【已满】 &nbsp; &nbsp; 626433139【已满】 &nbsp;&nbsp; 566344079</p>
 </blockquote>
diff --git a/OpenAuth.Repository/OpenAuthDBContext.cs b/OpenAuth.Repository/OpenAuthDBContext.cs
index edb32c76..d93f8c8a 100644
--- a/OpenAuth.Repository/OpenAuthDBContext.cs
+++ b/OpenAuth.Repository/OpenAuthDBContext.cs
@@ -77,7 +77,7 @@ namespace OpenAuth.Repository
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<DataPrivilegeRule>()
-                .HasKey(c => new {c.Id});
+                .HasKey(c => new { c.Id });
             modelBuilder.Entity<SysTableColumn>().HasNoKey();
             modelBuilder.Entity<QueryStringObj>().HasNoKey();
 
@@ -86,7 +86,7 @@ namespace OpenAuth.Repository
                 || Database.ProviderName == "Oracle.EntityFrameworkCore")
             {
                 var boolToSmallIntConverter = new ValueConverter<bool, short>(
-                    v => v ? (short) 1 : (short) 0,
+                    v => v ? (short)1 : (short)0,
                     v => v != 0);
                 foreach (var entityType in modelBuilder.Model.GetEntityTypes())
                 {
@@ -106,21 +106,32 @@ namespace OpenAuth.Repository
                         }
                     }
                 }
-            }
 
-            //如果数据库是Oracle，则将所有表名和字段名转换为大写
-            if (Database.ProviderName == "Oracle.EntityFrameworkCore")
-            {
+                // Oracle和PostgreSQL将所有属性映射到大写/小写列名
                 foreach (var entity in modelBuilder.Model.GetEntityTypes())
                 {
-                    entity.SetTableName(entity.GetTableName().ToUpper());
-                    // 将所有属性映射到大写列名
+                    if (Database.ProviderName == "Oracle.EntityFrameworkCore")
+                    {
+                        entity.SetTableName(entity.GetTableName().ToUpper());
+                    }
+                    else if (Database.ProviderName == "Npgsql.EntityFrameworkCore.PostgreSQL")
+                    {
+                        entity.SetTableName(entity.GetTableName().ToLower());
+                    }
+
                     foreach (var property in entity.GetProperties())
                     {
                         var storeObject = StoreObjectIdentifier.Create(entity, StoreObjectType.Table);
                         if (storeObject.HasValue)
                         {
-                            property.SetColumnName(property.GetColumnName(storeObject.Value).ToUpper());
+                            if (Database.ProviderName == "Oracle.EntityFrameworkCore")
+                            {
+                                property.SetColumnName(property.GetColumnName(storeObject.Value).ToUpper());
+                            }
+                            else if (Database.ProviderName == "Npgsql.EntityFrameworkCore.PostgreSQL")
+                            {
+                                property.SetColumnName(property.GetColumnName(storeObject.Value).ToLower());
+                            }
                         }
                     }
                 }
diff --git a/OpenAuth.Repository/Test/TestBase.cs b/OpenAuth.Repository/Test/TestBase.cs
index ff940591..93dd2a72 100644
--- a/OpenAuth.Repository/Test/TestBase.cs
+++ b/OpenAuth.Repository/Test/TestBase.cs
@@ -83,12 +83,7 @@ namespace OpenAuth.Repository.Test
                 {
                     DbType = dbType.Value,
                     ConnectionString = connectionString,
-                    IsAutoCloseConnection = true,
-                    MoreSettings=new ConnMoreSettings() { 
-                        PgSqlIsAutoToLower = false,//增删查改支持驼峰表
-                        PgSqlIsAutoToLowerCodeFirst = false, // 建表建驼峰表。5.1.3.30 
-                        IsAutoToUpper=false //禁用自动转成大写表
-                    }
+                    IsAutoCloseConnection = true
                 });
                 return sqlSugar;
             });
diff --git a/OpenAuth.WebApi/Startup.cs b/OpenAuth.WebApi/Startup.cs
index a357bffa..46c05d32 100644
--- a/OpenAuth.WebApi/Startup.cs
+++ b/OpenAuth.WebApi/Startup.cs
@@ -184,11 +184,7 @@ namespace OpenAuth.WebApi
                 {
                     DbType = dbType.Value,
                     ConnectionString = connectionString,
-                    IsAutoCloseConnection = true,
-                    MoreSettings=new ConnMoreSettings() { 
-                        PgSqlIsAutoToLower = false,//增删查改支持驼峰表
-                        PgSqlIsAutoToLowerCodeFirst = false// 建表建驼峰表。5.1.3.30 
-                    }
+                    IsAutoCloseConnection = true
                 }, db => { db.Aop.OnLogExecuting = (sql, pars) => { logger.LogInformation(sql); }; });
                 return sqlSugar;
             });