fix

service/common_ly_service.go

 package service
 package service
 
 
 import (
 import (
-<<<<<<< Updated upstream
 	"fmt"
 	"fmt"
 	"github.com/syyongx/php2go"
 	"github.com/syyongx/php2go"
 	_ "github.com/tidwall/gjson"
 	_ "github.com/tidwall/gjson"
 	"search_server/model"
 	"search_server/model"
 	"search_server/pkg/config"
 	"search_server/pkg/config"
 	"strings"
 	"strings"
-=======
-	_ "github.com/tidwall/gjson"
-	"search_server/model"
->>>>>>> Stashed changes
 )
 )
 
 
 //关键词搜索过期时间
 //关键词搜索过期时间
@@ -44,7 +39,6 @@ func getSkuByGoodsSn(goods_list map[string]*model.LyClearGoodsList, supplier_inf
 	//
 	//
 	//fmt.Println(productList)
 	//fmt.Println(productList)
 	//return productList
 	//return productList
-<<<<<<< Updated upstream
 	originGoods := make(map[string]interface{}, 0)
 	originGoods := make(map[string]interface{}, 0)
 	sku_uique_judge := config.Get("redis_all.SKU_UNIQUE_JUDGE").String()
 	sku_uique_judge := config.Get("redis_all.SKU_UNIQUE_JUDGE").String()
 
 
@@ -67,9 +61,6 @@ func getSkuByGoodsSn(goods_list map[string]*model.LyClearGoodsList, supplier_inf
 
 
 	fmt.Println(originGoods)
 	fmt.Println(originGoods)
 	return originGoods
 	return originGoods
-=======
-	return nil
->>>>>>> Stashed changes
 }
 }
 
 
 /*
 /*