# Conflicts:
# .cursor/agent/小程序开发工程师/evolution/索引.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/产品.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/助理橙子.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/后端.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/团队.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/小程序.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/测试.md resolved by origin/main(远端) version
# .cursor/agent/开发助理/项目索引/管理端.md resolved by origin/main(远端) version
# .cursor/meeting/README.md resolved by origin/main(远端) version
# .cursor/scripts/create-offline-bundle.sh resolved by origin/main(远端) version
# .cursor/scripts/gitea-sync.sh resolved by origin/main(远端) version
# .cursor/skills/assistant-doc-sync/sync-log.md resolved by origin/main(远端) version
# miniprogram/app.js resolved by origin/main(远端) version
# miniprogram/pages/avatar-nickname/avatar-nickname.js resolved by origin/main(远端) version
# miniprogram/pages/avatar-nickname/avatar-nickname.wxml resolved by origin/main(远端) version
# miniprogram/pages/avatar-nickname/avatar-nickname.wxss resolved by origin/main(远端) version
# miniprogram/pages/match/match.js resolved by origin/main(远端) version
# miniprogram/pages/match/match.wxml resolved by origin/main(远端) version
# miniprogram/pages/read/read.js resolved by origin/main(远端) version
# miniprogram/pages/read/read.wxml resolved by origin/main(远端) version
# miniprogram/pages/read/read.wxss resolved by origin/main(远端) version
# miniprogram/project.private.config.json resolved by origin/main(远端) version
# miniprogram/utils/contentParser.js resolved by origin/main(远端) version
# miniprogram/utils/mpPagePopups.js resolved by origin/main(远端) version
# new-soul/miniprogram/pages/referral/referral.wxss.broken resolved by origin/main(远端) version
# new-soul/soul-admin/deploy_admin.py resolved by origin/main(远端) version
# scripts/miniprogram_upload.sh resolved by origin/main(远端) version
# soul-admin/deploy_admin.py resolved by origin/main(远端) version
# soul-admin/dist/index.html resolved by origin/main(远端) version
# soul-admin/master.py resolved by origin/main(远端) version
# soul-admin/src/App.tsx resolved by origin/main(远端) version
# soul-admin/src/components/RichEditor.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/content/ContentPage.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/dashboard/DashboardPage.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/settings/SettingsPage.tsx resolved by origin/main(远端) version
# soul-admin/src/pages/users/UsersPage.tsx resolved by origin/main(远端) version
# soul-admin/tsconfig.tsbuildinfo resolved by origin/main(远端) version
# soul-api/.env.production resolved by origin/main(远端) version
# soul-api/devloy.py resolved by origin/main(远端) version
# soul-api/internal/config/config.go resolved by origin/main(远端) version
# soul-api/internal/database/database.go resolved by origin/main(远端) version
# soul-api/internal/handler/autolink.go resolved by origin/main(远端) version
# soul-api/internal/handler/book.go resolved by origin/main(远端) version
# soul-api/internal/handler/chapter_preview.go resolved by origin/main(远端) version
# soul-api/internal/handler/db_link_tag.go resolved by origin/main(远端) version
# soul-api/internal/handler/db_person.go resolved by origin/main(远端) version
# soul-api/internal/handler/miniprogram.go resolved by origin/main(远端) version
# soul-api/internal/handler/user.go resolved by origin/main(远端) version
# soul-api/internal/handler/vip_members_admin.go resolved by origin/main(远端) version
# soul-api/internal/model/chapter.go resolved by origin/main(远端) version
# soul-api/internal/router/router.go resolved by origin/main(远端) version
# soul-api/master.py resolved by origin/main(远端) version
# soul-api/soul-api-new resolved by origin/main(远端) version
# soul-api/wechat/info.log resolved by origin/main(远端) version
# 开发文档/10、项目管理/运营与变更.md resolved by origin/main(远端) version
# 开发文档/10、项目管理/项目落地推进表.md resolved by origin/main(远端) version
# 开发文档/6、后端/miniprogram接口补全说明.md resolved by origin/main(远端) version
# 开发文档/6、后端/管理端鉴权设计.md resolved by origin/main(远端) version
# 开发文档/8、部署/商家转账.md resolved by origin/main(远端) version
# 开发文档/8、部署/宝塔反向代理说明.md resolved by origin/main(远端) version
# 开发文档/8、部署/提现功能完整技术文档.md resolved by origin/main(远端) version
# 开发文档/8、部署/订阅消息.md resolved by origin/main(远端) version
# 开发文档/8、部署/部署总览.md resolved by origin/main(远端) version
# 开发文档/README.md resolved by origin/main(远端) version
61445d34f0