diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 3731ffd..c7b7c13 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3474,11 +3474,7 @@ Page({
               var req_d = {
                 "store_id": os.stoid,
                 "goods_id": that.data.gid,
-<<<<<<< HEAD
                 "user_id": getApp().globalData.user_id,
-=======
-                "user_id": getApp().globalData.user_id
->>>>>>> dev_oa_fu27
               }
               getApp().request.get(url, {
                 data: req_d,