wip:冲突合并

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -132,7 +132,7 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 		pushSet["o_follow_project"] = o_follow_project
 	}
 	//业主监控 P303
-	fool, o_owner_monitor := pushSetMontage(o_pushset["o_owner_monitor"], "o_owner_monitor", powerData, ShowWx)
+	fool, o_owner_monitor := pushSetMontage(o_pushset["o_owner_monitor"], "o_owner_monitor", powerData, ShowWx, registedate)
 	if fool {
 		pushSet["o_owner_monitor"] = o_owner_monitor
 	}