# Conflicts:
# .cursor/meeting/README.md resolved by yongxu version
# .gitignore resolved by yongxu version
# miniprogram/pages/index/index.js resolved by yongxu version
# miniprogram/pages/read/read.js resolved by yongxu version
# miniprogram/pages/read/read.wxml resolved by yongxu version
# soul-admin/dist/index.html resolved by yongxu version
# soul-admin/src/App.tsx resolved by yongxu version
# soul-admin/src/components/RichEditor.css resolved by yongxu version
# soul-admin/src/components/RichEditor.tsx resolved by yongxu version
# soul-admin/src/components/modules/user/UserDetailModal.tsx resolved by yongxu version
# soul-admin/src/layouts/AdminLayout.tsx resolved by yongxu version
# soul-admin/src/pages/chapters/ChaptersPage.tsx resolved by yongxu version
# soul-admin/src/pages/content/ContentPage.tsx resolved by yongxu version
# soul-admin/src/pages/dashboard/DashboardPage.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/FindPartnerPage.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/CKBConfigPanel.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/CKBStatsTab.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/FindPartnerTab.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/MatchPoolTab.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/MatchRecordsTab.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/MentorBookingTab.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/MentorTab.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/ResourceDockingTab.tsx resolved by yongxu version
# soul-admin/src/pages/find-partner/tabs/TeamRecruitTab.tsx resolved by yongxu version
# soul-admin/src/pages/mentors/MentorsPage.tsx resolved by yongxu version
# soul-admin/src/pages/referral-settings/ReferralSettingsPage.tsx resolved by yongxu version
# soul-admin/src/pages/settings/SettingsPage.tsx resolved by yongxu version
# soul-admin/src/pages/users/UsersPage.tsx resolved by yongxu version
# soul-admin/tsconfig.tsbuildinfo resolved by yongxu version
# soul-api/internal/database/database.go resolved by yongxu version
# soul-api/internal/handler/admin_dashboard.go resolved by yongxu version
# soul-api/internal/handler/book.go resolved by yongxu version
# soul-api/internal/handler/ckb.go resolved by yongxu version
# soul-api/internal/handler/db_book.go resolved by yongxu version
# soul-api/internal/handler/db_person.go resolved by yongxu version
# soul-api/internal/handler/match_records.go resolved by yongxu version
# soul-api/internal/handler/user.go resolved by yongxu version
# soul-api/internal/model/chapter.go resolved by yongxu version
# soul-api/internal/model/person.go resolved by yongxu version
# soul-api/internal/router/router.go resolved by yongxu version
# 开发文档/10、项目管理/运营与变更.md resolved by yongxu version
# 开发文档/1、需求/需求汇总.md resolved by yongxu version
# 开发文档/README.md resolved by yongxu version
# Conflicts:
# miniprogram/app.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/app.json resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/addresses/addresses.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/addresses/edit.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/agreement/agreement.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/chapters/chapters.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/index/index.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/index/index.wxml resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/match/match.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/my/my.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/my/my.wxml resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/my/my.wxss resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/privacy/privacy.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/purchases/purchases.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/read/read.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/read/read.wxml resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/referral/referral.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/referral/referral.wxml resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/referral/referral.wxss resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/settings/settings.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/pages/withdraw-records/withdraw-records.js resolved by origin/yongpxu-soul(远端) version
# miniprogram/project.config.json resolved by origin/yongpxu-soul(远端) version
# miniprogram/project.private.config.json resolved by origin/yongpxu-soul(远端) version
# miniprogram/utils/chapterAccessManager.js resolved by origin/yongpxu-soul(远端) version
# Conflicts:
# .cursorrules resolved by yongpxu-soul version
# miniprogram/app.json resolved by yongpxu-soul version
# miniprogram/pages/index/index.js resolved by yongpxu-soul version
# miniprogram/pages/index/index.wxml resolved by yongpxu-soul version
# miniprogram/pages/my/my.js resolved by yongpxu-soul version
# miniprogram/pages/my/my.wxml resolved by yongpxu-soul version
# miniprogram/pages/my/my.wxss resolved by yongpxu-soul version
# miniprogram/pages/settings/settings.js resolved by yongpxu-soul version
# miniprogram/pages/settings/settings.wxml resolved by yongpxu-soul version
# miniprogram/上传小程序.py resolved by yongpxu-soul version
# next-project/app/admin/error.tsx resolved by yongpxu-soul version
# next-project/app/admin/page.tsx resolved by yongpxu-soul version
# next-project/app/api/book/all-chapters/route.ts resolved by yongpxu-soul version
# next-project/lib/admin-auth.ts resolved by yongpxu-soul version
# next-project/lib/db.ts resolved by yongpxu-soul version
# next-project/lib/password.ts resolved by yongpxu-soul version
# next-project/package.json resolved by yongpxu-soul version
# next-project/scripts/.env.feishu.example resolved by yongpxu-soul version
# next-project/scripts/fix_souladmin_login.sh resolved by yongpxu-soul version
# next-project/scripts/send_poster_to_feishu.py resolved by yongpxu-soul version
# next-project/scripts/upload_soul_article.sh resolved by yongpxu-soul version
# soul-admin/dist/assets/index-CbOmKBRd.js resolved by yongpxu-soul version
# soul-admin/dist/index.html resolved by yongpxu-soul version
# 开发文档/10、项目管理/产研团队 第21场 20260129 许永平.txt resolved by yongpxu-soul version
# 开发文档/5、接口/配置清单-完整版.md resolved by yongpxu-soul version
# 开发文档/服务器管理/references/端口配置表.md resolved by yongpxu-soul version
