merge master

2021-09-03 10:48:40 +08:00
parent 7ea6609db0 591280b9fd
commit 4437c6eb11
13 changed files with 81 additions and 24 deletions
--- a/client/orm/orm.go
+++ b/client/orm/orm.go
@@ -536,7 +536,6 @@ func (o *orm) BeginWithCtxAndOpts(ctx context.Context, opts *sql.TxOptions) (TxO
 			db:    &TxDB{tx: tx},
 		},
 	}
-
 	var taskTxOrm TxOrmer = _txOrm
 	return taskTxOrm, nil
 }