From 596c2decb54b68a57050d1144b4f2f847dc98803 Mon Sep 17 00:00:00 2001 From: Guanxiying Date: Tue, 30 May 2023 09:18:45 +0800 Subject: [PATCH] * Fix return type of getList and getReportContent. --- module/measurement/model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/measurement/model.php b/module/measurement/model.php index ef3069d48e..30bc759c6d 100644 --- a/module/measurement/model.php +++ b/module/measurement/model.php @@ -58,9 +58,9 @@ class measurementModel extends model * @param string $orderBy * @param object $pager * @access public - * @return object + * @return array */ - public function getList(string $browseType, int $queryID, string $orderBy, object $pager = null): object + public function getList(string $browseType, int $queryID, string $orderBy, object $pager = null): array { $measurementQuery = ''; if($browseType == 'bysearch') @@ -972,9 +972,9 @@ class measurementModel extends model * @param int $reportID * @param int $controlID * @access public - * @return void + * @return string */ - public function getReportContent($reportID, $controlID): void + public function getReportContent($reportID, $controlID): string { global $lang; $report = $this->loadModel('report')->getReportByID($reportID);