Merge branch 'dev/v4.8.40_ws' of qmx/jy into feature/v4.8.40

src/jfw/front/tags.go

@@ -519,9 +519,6 @@ func (this *Tags) GetStype(href string) (list []map[string]interface{}) {
 		list = qu.ObjArrToMapArr(l)
 	} else {
 		m := []map[string]interface{}{}
-<<<<<<< HEAD
-		data := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name !="拟建项目" and name != "采购意向" and pid=0 order by id`)
-=======
 		var data []map[string]interface{}
 		//newData := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name = "拟建项目" or name = "采购意向" order by id`)
 		//if newData != nil && len(*newData) > 0 {
@@ -532,7 +529,6 @@ func (this *Tags) GetStype(href string) (list []map[string]interface{}) {
 		if oldData != nil && len(*oldData) > 0 {
 			data = append(data, *oldData...)
 		}
->>>>>>> master
 		codeMap := map[int64][]int64{}
 		level1 := []int64{}
 		nameToCode := map[string]int64{}

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -487,17 +487,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if power == 3 {
 			rData["onTrial"] = true
 		}
-<<<<<<< HEAD
 		rData["name"] = buyerName
-=======
-		if userId == "" { //未登录用户限制字段
-			rData = map[string]interface{}{
-				"city":       rData["city"],
-				"buyerclass": rData["buyerclass"],
-				"province":   rData["province"],
-			}
-		}
->>>>>>> master
 		return rData, nil
 	}()
 	if errMsg != nil {