Merge branch 'develop'

# Conflicts:
#	app/common/utils/FeishuMessage.php
#	app/inquiry/controller/InquiryLogController.php
#	app/queue/redis/FeishuMessage.php
This commit is contained in:
mzl
2025-07-29 12:35:19 +08:00
parent 7eeb1b6e1f
commit a86ec2e105
3 changed files with 14 additions and 5 deletions
@@ -46,11 +46,6 @@ class InquiryLogController extends BaseController
if (isset($data['t_time'])) {
$data['t_time'] = $data['t_time'] > 0 ? date('Y-m-d H:i:s', $data['t_time']) : 0;
}
if (isset($data['quality'])) {
$inquiryLogService = new InquiryLogService();
$data['quality'] = $inquiryLogService->qualityName($data['quality']);
}
// var_dump($data);
return $data;
}