Merge remote-tracking branch 'origin/main'

This commit is contained in:
withchao 2023-08-24 13:49:16 +08:00
commit b0f29f6153
2 changed files with 5 additions and 2 deletions

View File

@ -16,6 +16,7 @@ package data_conversion
import ( import (
"fmt" "fmt"
"github.com/Shopify/sarama" "github.com/Shopify/sarama"
) )

View File

@ -17,11 +17,13 @@ package data_conversion
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "time"
"github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/log"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"
"time"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
) )
var ( var (