Merge branch 'master' of ssh://47.101.48.251:/data/git/wx.sstbc.com

app/Http/Controllers/Admin/CompanyController.php

@@ -191,6 +191,7 @@ class CompanyController extends BaseController
      *     @OA\Parameter(name="company_product", in="query", @OA\Schema(type="string", format="textarea", nullable=true), description="产品"),
      *     @OA\Parameter(name="overseas_experience", in="query", @OA\Schema(type="string", nullable=true), description="海外经验"),
      *     @OA\Parameter(name="sales_volume", in="query", @OA\Schema(type="string", nullable=true), description="销售额"),
+     *     @OA\Parameter(name="tag", in="query", @OA\Schema(type="string", nullable=true), description="标签，千企走访这类的数据"),
      *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="认证token"),
      *     @OA\Response(
      *         response="200",

app/Http/Controllers/Admin/OtherController.php

@@ -41,9 +41,9 @@ class OtherController extends CommonController
     public function home()
     {
         // 校友总数
-        $schoolmate['schoolmate_total'] = User::where('is_schoolmate', 1)->distinct('mobile')->count();
+        $schoolmate['schoolmate_total'] = User::where('is_schoolmate', 1)->count();
         // 2025年校友数
-        $schoolmate['schoolmate_year'] = User::where('is_schoolmate', 1)->where('created_at', 'like', '%' . date('Y') . '%')->distinct('mobile')->count();
+        $schoolmate['schoolmate_year'] = User::where('is_schoolmate', 1)->where('created_at', 'like', '%' . date('Y') . '%')->count();
         // 上市企业总市值
         $company['company_market'] = Company::where('company_market', 1)->sum('market_value');
         // 校友企业总融资额

app/Http/Controllers/Mobile/SupplyDemandController.php

@@ -247,7 +247,7 @@ class SupplyDemandController extends CommonController
         if (empty($dialogue)) {
             // 不能给自己发信息
             if ($all['to_user_id'] == $this->getUserId()) {
-                return $this->error('不能给自己发信息');
+                return $this->fail([ResponseCode::ERROR_BUSINESS, '不能给自己发信息']);
             }
             // 创建一条会话
             $dialogue = Dialogue::create([

database/migrations/2025_07_17_162734_create_companies_table.php

@@ -20,8 +20,10 @@ return new class extends Migration {
             $table->string('company_name')->nullable()->comment('企业名字');
             // 行业类型
             $table->string('company_attribute')->nullable()->comment('行业类型');
-            // 标签
+            // 标签-接口获取
             $table->string('company_tag')->nullable()->comment('标签');
+            // 标签-千企走访
+            $table->string('tag')->nullable()->comment('标签');
             // 企业规模
             $table->string('company_scale')->nullable()->comment('企业规模');
             // 成立时间