冲突

src/jfw/modules/publicapply/src/detail/dao/bidding.go

@@ -347,18 +347,11 @@ func (bi *BidInfo) BiddingDataFormat(obj map[string]interface{}, b *BaseInfo) {
 			if bi.BaseInfo.PublicType == "平台发布" && common.IntAll(obj["is_yg_new"]) != 1 {
 				isPurchase = false
 				bi.BaseInfo.InfoAttribute = "" //bidding 详情页
-<<<<<<< HEAD
-				bi.Purchase = isPurchase
-			}
-		}
-		if isPurchase { //阳光直采 且 是新网站
-=======
 				//bi.Purchase = isPurchase
 			}
 		}
 		if isPurchase { //阳光直采 且 是新网站
 			bi.Next = !isPurchase
->>>>>>> master
 			bi.BaseInfo.PublicType = fmt.Sprintf("%s%s", dc.Config.PurchaseInfo.Name, bi.BaseInfo.PublicType)
 			if !bi.Purchase {
 				bi.Abstract.Default.Buyer = consts.NoPower
@@ -435,14 +428,10 @@ func (bi *BidInfo) BiddingDataFormat(obj map[string]interface{}, b *BaseInfo) {
 	//href="#"为竞品
 	href := common.ObjToString(obj["href"])
 	//运营商专版权限 且 运营商专版搜索入口
-<<<<<<< HEAD
-	if bi.Operator && b.PageType == "yyszb" {
-=======
 	if bi.Next {
 		bi.Next = !consts.FirstTypeCheck[b.PageType]
 	}
 	if consts.FirstTypeCheck[b.PageType] && bi.Operator {
->>>>>>> master
 		bi.Detail.OriginalHref = href
 		if href != "" {
 			bi.Detail.OriginalShow = true
@@ -744,7 +733,6 @@ func DescriptionHandle(stype string, obj map[string]interface{}) string {
 		description = strings.Join(descriptionArr, ",")
 	}
 	return description
-<<<<<<< HEAD
 }
 
 // IsSubscribe 获取用户是否关注
@@ -758,6 +746,4 @@ func IsSubscribe(mgoId string) bool {
 		}
 	}
 	return false
-=======
->>>>>>> master
 }