升级数据表结构体生成的内容

sql2go/generate_dao.go

@@ -20,15 +20,15 @@ func GenerateDao(sql string, packageName string, withGetTableNameFunc bool) (str
 	if len(packageName) == 0 {
 		packageName = "dao"
 	}
-	dataStruct, basic, err := ParseCreateTableSql(sql, withGetTableNameFunc)
+	basic, err := ParseCreateTableSql(sql)
 	if nil != err {
 		return "", err
 	}
 	replaceTable := map[string]string{
 		"{PACKAGE}":          packageName,
-		"{DATA_STRUCT_DAO}":  basic.ModelStruct + "Dao",
+		"{DATA_STRUCT_DAO}":  basic.ModelStructName + "Dao",
 		"{DATA_STRUCT_NAME}": basic.ModelStruct,
-		"{DATA_STRUCT}":      dataStruct,
+		"{DATA_STRUCT}":      basic.ModelStruct,
 		"{DAO_RECEIVER}":     getDaoReceiver(basic.TableName),
 		"{DB_TABLE_NAME}":    basic.TableName,
 		"{PRIMARY_KEY}":      "ID",