Merge branch 'master' into cs

This commit is contained in:
Your Name
2026-05-05 13:30:23 +08:00
4 changed files with 1304 additions and 73 deletions
@@ -11,7 +11,7 @@ class ConversionController extends BaseAdminController
{
public function overview()
{
$result = ConversionLogic::overview($this->request->get());
$result = ConversionLogic::overview($this->request->get(), $this->adminId, $this->adminInfo);
return $this->data($result);
}