Merge branch 'feature/v1.1.52_ws' of BaseService/jyMicroservices into feature/v1.1.52

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -269,7 +269,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 					IWxpush:   common.Int64All(common.If(ShowWx, 1, 0)),
 					IMailpush: 0,
 					IRatemode: 1,
-					IsWxShow:  0,
+					IsWxShow:  1,
 				}
 			} else {
 				returnData = &bxsubscribe.PushSet{
@@ -278,7 +278,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 					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, 1, (*data)["i_ratemode"])),
-					IsWxShow:  0,
+					IsWxShow:  1,
 				}
 			}
 		} else {