diff --git a/DatabasetoEntityclass/Template/DataGridView_1.template b/DatabasetoEntityclass/Template/DataGridView_1.template
index 4760c21..920dbf4 100644
--- a/DatabasetoEntityclass/Template/DataGridView_1.template
+++ b/DatabasetoEntityclass/Template/DataGridView_1.template
@@ -7,7 +7,7 @@ $end
 $foreach(filedInfo in filedInfos)
 				${filedInfo["field_name"]}Column.HeaderText = "${filedInfo["comment"]}";
 $end
-				${dgv_name}.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.ColumnHeader;
+				${dgv_name}.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
 				${dgv_name}.AutoGenerateColumns = true;
 
 $if(timeFiledStr != "")
diff --git a/DatabasetoEntityclass/Template/DataGridView_2.template b/DatabasetoEntityclass/Template/DataGridView_2.template
index 16f7a93..b0cc12c 100644
--- a/DatabasetoEntityclass/Template/DataGridView_2.template
+++ b/DatabasetoEntityclass/Template/DataGridView_2.template
@@ -36,7 +36,7 @@ $if(isGenOperationColumn)
         if (cols.Count > 0)
 		this.${dgv_name}.FirstDisplayedScrollingColumnIndex = cols.Count - 2;
 $end
-		${dgv_name}.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.ColumnHeader;
+		${dgv_name}.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
 		DataTable data = DbHelperMySQL.Query("select * from ${sql_table_name}");
 		this.${dgv_name}.DataSource = data;
 
diff --git a/DatabasetoEntityclass/Template/DataGridView_3.template b/DatabasetoEntityclass/Template/DataGridView_3.template
index 75c80fc..170f319 100644
--- a/DatabasetoEntityclass/Template/DataGridView_3.template
+++ b/DatabasetoEntityclass/Template/DataGridView_3.template
@@ -37,7 +37,7 @@ $if(isGenOperationColumn)
             if (cols.Count > 0)
 		    this.${dgv_name}.FirstDisplayedScrollingColumnIndex = cols.Count - 2;
 $end
-            ${dgv_name}.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.ColumnHeader;
+            ${dgv_name}.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
             DataTable data = DbHelperMySQL.Query($"select * from ${sql_table_name}");
             this.${dgv_name}.DataSource = data;