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
@@ -75,6 +75,7 @@ class TicketController extends BaseController
public function getStatus(Request $request)
{
try {
$request->setGet('user_id', $request->user->uid);
$result = (new TicketService())->getStatus($request->all());
return $result
? $this->success($result)