Merge branch 'master' of ssh://47.101.48.251/data/git/xxfcyds2026/xxfcyds2026-backend
# Conflicts:
# app/Http/Controllers/Api/Admin/ApplicationController.php
# public/admin/assets/AdminDashboardView-2EgYczsT.js
# public/admin/assets/AdminDashboardView-D5GBjoqm.js
# public/admin/assets/AdminDashboardView-kgL1KvmH.js
# public/admin/assets/AdminLayout-DGHsDyPL.js
# public/admin/assets/AdminLoginView-BmPlqp5p.js
# public/admin/assets/ApplyView-BI6U_ACB.js
# public/admin/assets/CompetitionFormView-2pdyZM2J.css
# public/admin/assets/CompetitionFormView-B4Dhn1r3.css
# public/admin/assets/CompetitionFormView-CecS3Rdu.js
# public/admin/assets/CompetitionFormView-DeYU2fhG.css
# public/admin/assets/CompetitionListView-B_kc1_oe.js
# public/admin/assets/CompetitionListView-DHw5XIy0.js
# public/admin/assets/CompetitionListView-uN_Dz1Rm.js
# public/admin/assets/LoginView-DBowGhkb.js
# public/admin/assets/MainLayout-C3pdCs76.js
# public/admin/assets/MainLayout-eYp5CUuP.js
# public/admin/assets/MainLayout-uJm0wEFg.js
# public/admin/assets/ParticipantLandingView-Cz3jUbI1.js
# public/admin/assets/ParticipantLandingView-Dj2XZAvL.js
# public/admin/assets/ParticipantLandingView-DuP0a9Xk.js
# public/admin/assets/PublicSourceChannelManageView-CcmbvtZ2.js
# public/admin/assets/PublicSourceChannelManageView-DV07pKpd.js
# public/admin/assets/PublicSourceChannelManageView-DmLoGu_J.js
# public/admin/assets/ReviewPortalView-BXCyBv4M.js
# public/admin/assets/ReviewPortalView-C0MAY-vW.js
# public/admin/assets/ReviewPortalView-Dm_x3v3c.js
# public/admin/assets/ReviewerApplicationDetailView-xywkIE8-.js
# public/admin/assets/ReviewerLayout-CBJQINiq.js
# public/admin/assets/ReviewerLayout-Dng_WA40.js
# public/admin/assets/ReviewerLayout-UH1iIXWC.js
# public/admin/assets/ReviewerLoginView-BMkjdH3W.js
# public/admin/assets/ReviewerLoginView-Dts3J0CE.js
# public/admin/assets/ReviewerLoginView-rztVjgou.js
# public/admin/assets/ReviewerManageView-C6e7tKYh.js
# public/admin/assets/ReviewerManageView-CqSgZeEp.js
# public/admin/assets/ReviewerManageView-D2yRF18b.js
# public/admin/assets/ReviewerProjectsView-B2U9qLXM.js
# public/admin/assets/ReviewerProjectsView-Bodta4LT.js
# public/admin/assets/ReviewerProjectsView-C2rG6lxS.js
# public/admin/assets/adminCompetition-1CFygGb2.js
# public/admin/assets/adminCompetition-BA2psHSa.js
# public/admin/assets/adminCompetition-DHQ6I3V_.js
# public/admin/assets/competitions-C45r5b16.js
# public/admin/assets/competitions-DlAB-YAQ.js
# public/admin/assets/competitions-Y1Kxy9qK.js
# public/admin/assets/index-DvwaCqlm.js
# public/admin/assets/index-dbH4sGPD.js
# public/admin/assets/index-p0iIJTm0.js
# public/admin/index.html
|
weizong song
lion