diff --git a/Src/Asp.Net/SqlServerTest/2_DbFirst.cs b/Src/Asp.Net/SqlServerTest/2_DbFirst.cs
index 6c5b86ef9..e58390014 100644
--- a/Src/Asp.Net/SqlServerTest/2_DbFirst.cs
+++ b/Src/Asp.Net/SqlServerTest/2_DbFirst.cs
@@ -11,7 +11,14 @@ namespace OrmTest
         public static void Init() 
         {
             var db = DbHelper.GetNewDb(); 
+
             db.DbFirst.CreateClassFile("c:\\Demo\\1", "Models");
+
+            db.DbFirst.IsCreateAttribute().CreateClassFile("c:\\Demo\\2", "Models");
+
+            db.DbFirst.StringNullable().IsCreateAttribute().CreateClassFile("c:\\Demo\\3", "Models");
+
+            db.DbFirst.FormatFileName(it => "Sys_"+it).CreateClassFile("c:\\Demo\\4", "Models"); 
         }
     }
 }
diff --git a/Src/Asp.Net/SqlServerTest/Program.cs b/Src/Asp.Net/SqlServerTest/Program.cs
index da4383636..ab122013b 100644
--- a/Src/Asp.Net/SqlServerTest/Program.cs
+++ b/Src/Asp.Net/SqlServerTest/Program.cs
@@ -25,7 +25,7 @@ namespace OrmTest
         /// Database connection string
         /// 数据库连接字符串
         /// </summary>
-        public readonly static string Connection = "server=.;uid=sa;pwd=sasa;database=SQLSUGAR4XTEST";
+        public readonly static string Connection = "server=.;uid=sa;pwd=sasa;database=SqlSugar5Demo";
 
         /// <summary>
         /// Get a new SqlSugarClient instance with specific configurations
diff --git a/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj b/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj
index 83e02edcf..8cc71d44c 100644
--- a/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj
+++ b/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj
@@ -67,27 +67,27 @@
     <Compile Include="1_CodeFirst.cs" />
     <Compile Include="2_DbFirst.cs" />
     <Compile Include="UnitTest\Description.cs" />
-    <Compile Include="UserTestCases\Demo\Demo2_Updateable.cs" />
-    <Compile Include="UserTestCases\Demo\Demo3_Insertable.cs" />
-    <Compile Include="UserTestCases\Demo\Demo4_Deleteable.cs" />
-    <Compile Include="UserTestCases\Demo\Demo5_SqlQueryable.cs" />
-    <Compile Include="UserTestCases\Demo\Demo6_Queue.cs" />
-    <Compile Include="UserTestCases\Demo\Demo7_Ado.cs" />
-    <Compile Include="UserTestCases\Demo\Demo8_Saveable.cs" />
-    <Compile Include="UserTestCases\Demo\Demo9_EntityMain.cs" />
-    <Compile Include="UserTestCases\Demo\DemoA_DbMain.cs" />
-    <Compile Include="UserTestCases\Demo\DemoB_Aop.cs" />
-    <Compile Include="UserTestCases\Demo\DemoC_GobalFilter.cs" />
-    <Compile Include="UserTestCases\Demo\Demo1_Queryable.cs" />
-    <Compile Include="UserTestCases\Demo\DemoD_DbFirst.cs" />
-    <Compile Include="UserTestCases\Demo\DemoE_CodeFirst.cs" />
-    <Compile Include="UserTestCases\Demo\DemoF_Utilities.cs" />
-    <Compile Include="UserTestCases\Demo\DemoG_SimpleClient.cs" />
-    <Compile Include="UserTestCases\Demo\DemoH_Tenant.cs" />
-    <Compile Include="UserTestCases\Demo\DemoJ_Report.cs" />
-    <Compile Include="UserTestCases\Demo\DemoL_Snowflake.cs" />
-    <Compile Include="UserTestCases\Demo\DemoM_UnitOfWork.cs" />
-    <Compile Include="UserTestCases\Demo\DemoN_SplitTable.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo2_Updateable.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo3_Insertable.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo4_Deleteable.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo5_SqlQueryable.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo6_Queue.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo7_Ado.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo8_Saveable.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo9_EntityMain.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoA_DbMain.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoB_Aop.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoC_GobalFilter.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo1_Queryable.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoD_DbFirst.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoE_CodeFirst.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoF_Utilities.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoG_SimpleClient.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoH_Tenant.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoJ_Report.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoL_Snowflake.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoM_UnitOfWork.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\DemoN_SplitTable.cs" />
     <Compile Include="UserTestCases\Models\DataDictionary.cs" />
     <Compile Include="UserTestCases\Models\Custom.cs" />
     <Compile Include="UserTestCases\Models\DiffLong.cs" />
@@ -98,7 +98,7 @@
     <Compile Include="UserTestCases\Models\AttributeTable.cs" />
     <Compile Include="UserTestCases\Models\Order.cs" />
     <Compile Include="UserTestCases\Models\OrderItem.cs" />
-    <Compile Include="UserTestCases\Demo\Demo0_SqlSugarClient.cs" />
+    <Compile Include="UserTestCases\Cases\OldDemo\Demo0_SqlSugarClient.cs" />
     <Compile Include="UserTestCases\Models\ViewOrder.cs" />
     <Compile Include="UserTestCases\Cases\UnitDynamicaaa.cs" />
     <Compile Include="UserTestCases\Cases\UnitBizDel.cs" />
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo0_SqlSugarClient.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo0_SqlSugarClient.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo0_SqlSugarClient.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo1_Queryable.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo1_Queryable.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo1_Queryable.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo1_Queryable.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo2_Updateable.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo2_Updateable.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo2_Updateable.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo2_Updateable.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo3_Insertable.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo3_Insertable.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo3_Insertable.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo3_Insertable.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo4_Deleteable.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo4_Deleteable.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo4_Deleteable.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo4_Deleteable.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo5_SqlQueryable.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo5_SqlQueryable.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo5_SqlQueryable.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo5_SqlQueryable.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo6_Queue.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo6_Queue.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo6_Queue.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo6_Queue.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo7_Ado.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo7_Ado.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo7_Ado.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo7_Ado.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo8_Saveable.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo8_Saveable.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo8_Saveable.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo8_Saveable.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo9_EntityMain.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo9_EntityMain.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Demo9_EntityMain.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Demo9_EntityMain.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoA_DbMain.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoA_DbMain.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoA_DbMain.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoA_DbMain.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoB_Aop.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoB_Aop.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoB_Aop.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoB_Aop.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoD_DbFirst.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoD_DbFirst.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoD_DbFirst.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoD_DbFirst.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoE_CodeFirst.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoE_CodeFirst.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoE_CodeFirst.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoE_CodeFirst.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoF_Utilities.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoF_Utilities.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoF_Utilities.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoF_Utilities.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoG_SimpleClient.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoG_SimpleClient.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoG_SimpleClient.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoG_SimpleClient.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoH_Tenant.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoH_Tenant.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoH_Tenant.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoH_Tenant.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoJ_Report.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoJ_Report.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoJ_Report.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoJ_Report.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoL_Snowflake.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoL_Snowflake.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoL_Snowflake.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoL_Snowflake.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoM_UnitOfWork.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoM_UnitOfWork.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoM_UnitOfWork.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoM_UnitOfWork.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoN_SplitTable.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoN_SplitTable.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/DemoN_SplitTable.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/DemoN_SplitTable.cs
diff --git a/Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Democ_GobalFilter.cs b/Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Democ_GobalFilter.cs
similarity index 100%
rename from Src/Asp.Net/SqlServerTest/UserTestCases/Demo/Democ_GobalFilter.cs
rename to Src/Asp.Net/SqlServerTest/UserTestCases/Cases/OldDemo/Democ_GobalFilter.cs