|
|
@@ -464,28 +464,17 @@ func IsInArr(arr []string, s string) bool {
|
|
|
}
|
|
|
|
|
|
var (
|
|
|
-<<<<<<< HEAD
|
|
|
- redisLock = &sync.Mutex{}
|
|
|
-=======
|
|
|
redisKey = fmt.Sprintf("pcindex_newArticle")
|
|
|
redisKeySL = fmt.Sprintf("pcindex_newArticle_second_level") //二级缓存
|
|
|
redisLock = &sync.Mutex{}
|
|
|
rn = 3
|
|
|
->>>>>>> master
|
|
|
)
|
|
|
|
|
|
// 获取最新招标信息
|
|
|
func (this *Tags) GetNewBidInfo() (list []map[string]interface{}) {
|
|
|
-<<<<<<< HEAD
|
|
|
var (
|
|
|
- redisKey = fmt.Sprintf("pcindex_newArticle")
|
|
|
- redisKeySL = fmt.Sprintf("pcindex_newArticle_second_level") //二级缓存
|
|
|
- ri int
|
|
|
- rn = 3
|
|
|
+ ri int
|
|
|
)
|
|
|
-=======
|
|
|
- var ri int
|
|
|
->>>>>>> master
|
|
|
var newBidInfos = func() (list []map[string]interface{}) {
|
|
|
// p397 未登录详情页最新招投标信息去掉拟建
|
|
|
var (
|
