Merge remote-tracking branch 'upstream/master'

This commit is contained in:
wangbin8909
2021-04-11 17:19:54 +08:00
62 changed files with 1226 additions and 1095 deletions

View File

@@ -4,7 +4,7 @@ import (
"errors"
"time"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/client/orm"
"github.com/mindoc-org/mindoc/conf"
)