feat:更新

src/jfw/front/classificationTag.go

@@ -1,33 +1,28 @@
 package front
 
 import (
-	qu "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/es"
-	"app.yhyue.com/moapp/jybase/redis"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
-	"app.yhyue.com/moapp/jypkg/public"
-	"encoding/json"
-	"fmt"
-	"jy/src/jfw/config"
-	"jy/src/jfw/jyutil"
-	"jy/src/jfw/paging"
-	"log"
-	"math"
-	"math/rand"
-	"strconv"
-	"sync"
-	"time"
+    qu "app.yhyue.com/moapp/jybase/common"
+    "app.yhyue.com/moapp/jybase/encrypt"
+    elastic "app.yhyue.com/moapp/jybase/es"
+    "app.yhyue.com/moapp/jybase/redis"
+    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
+    "app.yhyue.com/moapp/jypkg/public"
+    "encoding/json"
+    "fmt"
+    "jy/src/jfw/config"
+    "jy/src/jfw/jyutil"
+    "jy/src/jfw/paging"
+    "log"
+    "math"
+    "math/rand"
+    "strconv"
+    "sync"
+    "time"
 
-	"net/http"
+    "net/http"
 
-	qu "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/date"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
-	"app.yhyue.com/moapp/jybase/redis"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
-	"app.yhyue.com/moapp/jypkg/public"
+    "app.yhyue.com/moapp/jybase/date"
+    "app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 )
 
 type KeyType struct {
@@ -277,7 +272,6 @@ func GetIndustry(industryHref string) []map[string]interface{} {
 	return m
 }
 
-<<<<<<< HEAD
 type BuyerList struct {
 	Name string `json:"name"`
 	Url  string `json:"url"`
@@ -304,7 +298,8 @@ func HotBuyerList(entIsNew bool) []*BuyerList {
 		return buyerList
 	}
 	return nil
-=======
+}
+
 func GetIncludedInfo() map[string]interface{} {
 	if bytes, err := redis.GetBytes(RedisNameNew, "jyIncludedInfo"); err == nil && bytes != nil {
 		rData := map[string]interface{}{}
@@ -427,8 +422,8 @@ func NewIndexbids(session *httpsession.Session, r *http.Request) []map[string]in
 	return *lists
 }
 
-//格式输出数据
-//亿亿、万亿、亿、万 只有一位的时候保留1位小数点 两位及以上不保留  1.1亿  11亿
+// 格式输出数据
+// 亿亿、万亿、亿、万 只有一位的时候保留1位小数点 两位及以上不保留  1.1亿  11亿
 func formdataNum(num int64) (floatNum float64, unit string) {
 	s_num := strconv.Itoa(int(num))
 	len_m := len(s_num)
@@ -488,5 +483,4 @@ func formdataNum(num int64) (floatNum float64, unit string) {
 	//string 转float
 	floatNum, _ = strconv.ParseFloat(m, 64)
 	return floatNum, unit
->>>>>>> master
 }