Ver código fonte

Merge branch 'feature/v1.1.7' of http://127.0.0.1:8080/BaseService/jyMicroservices into feature/v1.1.7

zhangxinlei1996 2 anos atrás
pai
commit
3aaf6350f6

+ 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{}
 	/*
 	 *无推送记录生成推送记录