WH01243 2 years ago
parent
commit
295e357cf5
1 changed files with 0 additions and 3 deletions
  1. 0 3
      jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

+ 0 - 3
jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

@@ -65,11 +65,8 @@ func (l *GetSubListLogic) GetSubList(in *bxsubscribe.SubscribeInfosReq) (*bxsubs
 	    	  spqp.BaseServiceMysql = IC.PushMysql
 	          }*/
 	hasNextPage, total, list := model.NewSubscribePush(in.UserType).Datas(spqp)
-<<<<<<< HEAD
-=======
 	start1 := time.Now().Unix()
 	logx.Info("1、查询数据用户", start1-start)
->>>>>>> feature/v1.1.5
 	//hasNextPage, total, list = false, 0, []*bxsubscribe.SubscribeInfo{}
 	/*
 	 *无推送记录生成推送记录