Merge branch 'dev/v1.1.33_wh' of BaseService/jyMicroservices into feature/v1.1.33

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -203,8 +203,8 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 			} else {
 				returnData = &bxsubscribe.PushSet{
 					ATimes:      common.If((*data)["i_ratemode"] == nil, util.TimeMap[2], a_times).([]string),
-					IApppush:    common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
-					IApppushTip: common.Int64All(common.If((*data)["i_apppush_tip"] == nil, 1, (*data)["i_apppush_tip"])),
+					IApppush:    common.Int64All(common.If((*data)["i_apppush"] == nil, 0, (*data)["i_apppush"])),
+					IApppushTip: common.Int64All(common.If((*data)["i_apppush_tip"] == nil, 0, (*data)["i_apppush_tip"])),
 					IWxpush:     common.Int64All(common.If((*data)["i_wxpush"] == nil, common.If(ShowWx, 1, 0), common.If(ShowWx, (*data)["i_wxpush"], 0))),
 					IMailpush:   common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
 					IRatemode:   common.Int64All(common.If((*data)["i_ratemode"] == nil, 2, (*data)["i_ratemode"])),