wip:冲突处理

src/jfw/modules/publicapply/src/config.json

@@ -80,7 +80,12 @@
   "accountMergeOnline": "2015-03-30 00:00:00",
   "criticality":2,
   "taskStartTime":1698020000,
-<<<<<<< HEAD
+  "attachmentResPower": [
+    {
+      "name": "阳光直采",
+      "code": "ygzc_cgxx"
+    }
+  ],
   "configuration": {
     "bulletFrameStart": 1698020000,
     "bulletFrameEnd": 1698020000
@@ -88,12 +93,4 @@
   "frequentContinuous": 2,
   "screenNumb": 2,
   "stayTime ": 5
-=======
-  "attachmentResPower": [
-    {
-      "name": "阳光直采",
-      "code": "ygzc_cgxx"
-    }
-  ]
->>>>>>> master
 }

src/jfw/modules/publicapply/src/config/config.go

@@ -52,17 +52,14 @@ type config struct {
 	AccountMergeOnline string `json:"accountMergeOnline"`
 	Criticality        int    `json:"criticality"`
 	TaskStartTime      int64
-<<<<<<< HEAD
-	Configuration      map[string]interface{}
-	ScreenNumb         int64
-	FrequentContinuous int64
-	StayTime           int64
-=======
 	AttachmentResPower []struct {
 		Name string `json:"name"`
 		Code string `json:"code"`
 	} `json:"attachmentResPower"`
->>>>>>> master
+	Configuration      map[string]interface{}
+	ScreenNumb         int64
+	FrequentContinuous int64
+	StayTime           int64
 }
 
 type tipInfo struct {

src/jfw/modules/publicapply/src/detail/entity/entity.go

@@ -9,11 +9,8 @@ type BidInfo struct {
 	CanRead   bool                   `json:"canRead"`              //是否有权限查看
 	Topnet    bool                   `json:"topnet"`               //拓普身份
 	Token     string                 `json:"token"`                //
-<<<<<<< HEAD
-	BindPhone bool                   `json:"bindPhone"`            //是否绑定手机号
-=======
 	Purchase  bool                   `json:"purchase"`             //阳光直采-采购信息
->>>>>>> master
+	BindPhone bool                   `json:"bindPhone"`            //是否绑定手机号
 }
 
 // 基本信息

src/jfw/modules/publicapply/src/oneclick/entity/entity.go

@@ -369,7 +369,6 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 		if userId != "" && userPhone == "" {
 			if _, err := o.bindPhone(phone, true); err == nil {
 				jy.JyAppCreateSession(db.Mgo, o.Session, userId, 0, *o.ResponseWriter, true, config.Middleground, config.Config.AppPushServiceRpc, config.Config.Criticality)
-<<<<<<< HEAD
 				if c := public.Mysql.CountBySql("SELECT count(1) FROM dataexport_order WHERE (user_id = ? OR user_phone = ?) AND distribution_channel = 'x054'", userId, phone); c > 0 {
 					return -3
 				} else {
@@ -382,11 +381,9 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 						"isOnlyBind": true,
 					})
 				}
-=======
 			} else if err.Error() == PhoneHasBind {
 				//已经绑定过手机号
 				return -1
->>>>>>> master
 			}
 			return 3
 		}