companyProjecet.git

summary
reflog
commits
tree
docs
forks
compare

quanwei

2025-12-09 ca425b889f3c1b5847ffc26a0229307f7f8ef43e

 admin/app/api/controller/branch/Activity.php

@@ -39,7 +39,8 @@
    {
        $model = new ActivityModel;
        $list = $model->getList($category_id, $this->postData(), $this->getUser());
        return $this->renderSuccess('', compact('list'));
        $words = BranchSettingModel::getItem('words');
        return $this->renderSuccess('', compact('list', 'words'));
    }

    /**

			@@ -39,7 +39,8 @@
			{
			$model = new ActivityModel;
			$list = $model->getList($category_id, $this->postData(), $this->getUser());
			return $this->renderSuccess('', compact('list'));
			$words = BranchSettingModel::getItem('words');
			return $this->renderSuccess('', compact('list', 'words'));
			}

			/**