Merge branch 'release/v4.8.29_ws' of qmx/jy into release/v4.8.29

src/config.json

@@ -397,12 +397,8 @@
     "winnertel":true,
     "agencyperson":true,
     "agencytel":true,
-    "budget":false,
-    "bidamount":false,
-    "buyerclass": true,
-    "winner": true,
-    "s_winner": true,
-    "winnerMap": true
+    "budget":true,
+    "bidamount":true
   },
   "keywordsLimitNologin": 25,
   "messageCenter": {

src/jfw/front/swordfish.go

@@ -691,13 +691,13 @@ func wxvisitD(sid, userId, openId, content string, isPayUser bool) (objdata map[
 
 // wx pc obj字段统一处理
 func ObjData(isPayUser bool, sid, content string, lent int) (t bool, obj map[string]interface{}) {
-	brobj, ok := mongodb.Find("bidding_rec", bson.M{"s_id": sid}, `{"l_recoverydate":-1}`, public.MgoBiddingFields, false, 0, 1)
+	brobj, ok := mongodb.Find("bidding_rec", bson.M{"s_id": sid}, `{"l_recoverydate":-1}`, nil, false, 0, 1)
 	if ok && (*brobj) != nil && len(*brobj) == 1 && (*brobj)[0] != nil {
 		obj = (*brobj)[0]
 	} else {
-		aobj, ok := public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection, sid, public.MgoBiddingFields)
+		aobj, ok := public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection, sid, nil)
 		if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
-			aobj, ok = public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection_back, sid, public.MgoBiddingFields)
+			aobj, ok = public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection_back, sid, nil)
 		}
 		obj = *aobj
 	}

src/jfw/modules/app/src/app/front/swordfish.go

@@ -516,9 +516,9 @@ func wxvisitD(sid, userId string, isPayUser bool) (objdata map[string]interface{
 	defer util.Catch()
 	var obj map[string]interface{}
 	if len(sid) > 5 {
-		aobj, ok := public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection, sid, public.MgoBiddingFields)
+		aobj, ok := public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection, sid, nil)
 		if ok && (aobj == nil || *aobj == nil || len(*aobj) == 0) {
-			aobj, ok = public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection_back, sid, public.MgoBiddingFields)
+			aobj, ok = public.Mgo_Bidding.FindById(public.DbConf.Mongodb.Bidding.Collection_back, sid, nil)
 		}
 		//aobj, ok := elastic.GetByIdField("bidding", "bidding", sid, ""), true
 		obj = *aobj

src/jfw/modules/app/src/config.json

@@ -225,11 +225,7 @@
     "agencyperson":true,
     "agencytel":true,
     "budget":true,
-    "bidamount":true,
-    "buyer": true,
-    "winner": true,
-    "s_winner": true,
-    "winnerMap": true
+    "bidamount":true
   },
   "keepShowRedSpot": true,
   "detail_element": [