Merge branch 'master' into feature/v1.1.18

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -146,7 +146,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 				ATimes:    []string{"每日上午、下午各推送1次"},
 				IApppush:  1,
 				IWxpush:   common.Int64All(common.If((*data)["i_wxpush"] == nil, common.If(ShowWx, 1, 0), common.If(ShowWx, (*data)["i_wxpush"], 0))),
-				IMailpush: 0,
+				IMailpush: common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
 				IRatemode: 2,
 				IsWxShow:  1,
 			}