|
|
@@ -2,7 +2,7 @@ package common
|
|
|
|
|
|
import (
|
|
|
"context"
|
|
|
- "errors"
|
|
|
+ "encoding/json"
|
|
|
"fmt"
|
|
|
"log"
|
|
|
"strconv"
|
|
|
@@ -15,15 +15,6 @@ import (
|
|
|
"app.yhyue.com/moapp/jybase/common"
|
|
|
m "app.yhyue.com/moapp/jybase/mongodb"
|
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
|
-<<<<<<< HEAD
|
|
|
- "context"
|
|
|
- "encoding/json"
|
|
|
- "fmt"
|
|
|
- "log"
|
|
|
- "strconv"
|
|
|
- "time"
|
|
|
-=======
|
|
|
->>>>>>> master
|
|
|
)
|
|
|
|
|
|
func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *message.Messages) {
|
