Мод:
938fa2cb1a
cfclub
cfclub-act-204
cfclub-act-iwt
cfclub-jiapu
cfclub-rebuild
cfclub-sync
docs/2026-10-25-indicator-timeline-display
docs/2026-10-25-t24-t25
docs/2026-10-26-ui-token-convergence
docs/circular-deps-plan
docs/report-proxy-verify
docs/sc-g03-login-flow
docs/u8-split-plan
feat/indicator-timeline-t01
feat/indicator-timeline-t02
feat/indicator-timeline-t03
feat/indicator-timeline-t05-bodyfat
feat/kickoff-b1-contract-api
feat/nutrition-product-tagging-a
feat/report-date-editable
feat/sc-g-02-wechat-login
feat/sc-g-06-jwt-guard
feat/sc-p-03-switch-role
feat/sc-p-10-create-task
feat/sc-p-94-task-history
feat/sc-p-96-achievement-fivecol
feat/sc-x22-contract
feat/sc-x22-impl
feat/signature-canvas2d-v2
feature/activity-audience-fee
feature/activity-fee-display
feature/activity-team-t35
feature/activity-time-picker-5min
feature/admin-order-pay-display
feature/admin-order-ship-type
feature/admin-wx-scan-login
feature/ai-member-gate-backend
feature/ai-member-gate-fe
feature/ai-member-gate-frontend
feature/api-contract-gaps
feature/article-tts-auto-gen
feature/asset-library
feature/attribution-stage1-foundation
feature/attribution-stage2-core
feature/attribution-stage2-merge
feature/attribution-stage2-nonblocking
feature/b2-admin-auth-login-status
feature/b22-cf-nplusone
feature/b3-upload-validation
feature/b39-ci-fake-green-guard
feature/b39-pom-skiptests
feature/b39-skiptests-false-guard
feature/b4-butler-envelope-commission
feature/b46-admin-login-enable
feature/b5-result-4xx-factories
feature/b50-huawei-health
feature/b61-health-plan-auth
feature/b65-analyze-thread-id
feature/badges-child-contract
feature/badges-child-contract-gaps
feature/bundle-redesign-gap-files
feature/cf-f8-cleanup
feature/cf-level-amount-config
feature/cfc-en-001-energy-grant-500
feature/checkin-cf-callers
feature/child-zone-contract-evd9
feature/child-zone-contract-gaps
feature/ci-compile-gate
feature/ci-gate-huawei-charset-fix
feature/content-dimension-threshold-ui
feature/coupon-c2
feature/coupon-c2-cleanup
feature/coupon-c2-rebase
feature/coupon-c3-fix
feature/coupon-c3-restore
feature/coupon-center-c3
feature/coupon-merge-into-cfclub
feature/coupon-p2-into-cfclub
feature/coupon-p2-tech-debt
feature/d-indexhome
feature/dev-lead5-report-20261104
feature/diet-multi-meal
feature/dx-health-bridge-contract
feature/evd12r2-svc-contract
feature/evd13-parent-rest-contract
feature/evd14-ai-butler-contract
feature/evd15-cross-role-contract
feature/evd6-ci-continuous-regression
feature/evd7-report-closedloop-contract
feature/evd8-assessment-plan-evidence
feature/fam-join-dynamic-identity
feature/family-collect-pearl-octopus-mp
feature/family-coupon-unified
feature/family-earnings-admin-role
feature/family-metric-agg-config
feature/family-metric-agg-config-web
feature/family-overview
feature/food-overview-persistent-min
feature/gap-2026-10-13-checkin-task-linkage
feature/gap-2026-10-23-planner-cert-frontend
feature/gap-home-greet-my-messages
feature/growth-checkin-taskid
feature/guest-tabs-redesign
feature/guhe-gate-evidence-isolate
feature/guhe-kb-field-expose-t10-probe
feature/guhe-v2-version-split
feature/health-plan-default-self
feature/hl02-plan-edit
feature/hl03-plan-flow
feature/hl05-purchase-task
feature/home-checkin-diet-sleep-exercise
feature/home-health-growth-ui
feature/index-home-b2-sandbox-adapt
feature/indicator-timeline-gap-files
feature/indicator-trend-arrow
feature/langgraph-local-deploy
feature/legacy-dimension-call-log
feature/master-plan-gap-w3-w6
feature/membership-benefits-db
feature/membership-benefits-frontend
feature/membership-coupon-scope
feature/milestone-db-template
feature/nutrition-product-merge
feature/nutrition-product-tagging
feature/o7-five-dim-evidence
feature/o7-task-wish-sc-evidence
feature/onboarding-guide-account-scope
feature/pearl-diagram-redesign-gap-check
feature/planner-teacher-access
feature/proxy-fix-b1-core
feature/proxy-fix-b2-security
feature/proxy-fix-b3-robust
feature/proxy-fix-vfix
feature/proxy-verify-20261025
feature/recommendation-rule-engine
feature/remove-home-survey-cards
feature/report-trace
feature/report-trace-ratelimit
feature/report-upload-product-cards
feature/s-cfc-20
feature/s-cfc-56-pool-toggle
feature/s-cfc-57-family-join-gate
feature/s-cfc-58-join-validation-rules
feature/s-cfc-59-join-required-info
feature/s-cfc-70-star-digest
feature/sc-t29-g3-export-contract
feature/sec-20261031-contract-gaps
feature/service-role-entry
feature/signature-canvas2d
feature/signature-landscape
feature/signature-landscape-fix
feature/silent-login-fixed-openid-test
feature/sku-combo-design-superseded
feature/sop-attrib-gap-fix
feature/sop-hide-free-report-gap-fix
feature/sop-member-gap-fix
feature/sop-member-gap-fix-lx
feature/supply-team-invite
feature/syncgap-activity-poster-layout-config
feature/syncgap-recommendation-rule-engine
feature/t04-auto-created-dedup
feature/t04-l2-phase34
feature/t04-s2-gate
feature/t04-segment1
feature/t04-segment2-compare-favorite
feature/t05-dimension-unified-migration
feature/t19-nutrition-merge
feature/t28-fix-key-align
feature/t28-fix-key-align-write
feature/t29-b1v-verification
feature/t37-owner-settlement
feature/task-complete-500
feature/task-incentive-contractcheck-22sc
feature/task-parent-create-task
feature/tdd-dev1-yellow-20261104
feature/tdd-s-cfc-14-createTask
feature/team-hierarchy-treenode
feature/team-invitation-create
feature/team-product-performance
feature/team-product-performance-t32
feature/team-star-digest
feature/team-star-my-view
feature/terminology-neutralize-l1
feature/terminology-neutralize-l2-l3
feature/tr8-shop-member-contract
feature/u8-page-split-plan
feature/u8-split-batch1
feature/ui-article-feed-unify
feature/ui-token-30rpx
feature/ui-token-frontend-u1
feature/ui-token-u1-frontend
feature/ui-token-u3-radius
feature/ui-token-u5-color-tokens
feature/ui-token-u6-admin-spacing
feature/ui-token-u7-fontsize-fontweight
feature/ui-token-web
feature/uni-color-warm-deep
feature/unified-dimension-expand
feature/unified-dimension-gapfix
feature/unified-dimension-p0
feature/unified-dimension-p1
feature/unified-member-selector
feature/user-is-child
feature/user-portrait-ai-generation
feature/verify-activity-poster-layout-config
feature/verify-u7-r2
feature/verify-u7-r3
fix/admin-datetime-display
fix/admin-ppoint-menu
fix/admin-report-parser-route
fix/asset-library-ux
fix/b39-pom-skiptests-false
fix/b44-dashboard-child-text
fix/circular-deps
fix/confirm-button-color
fix/coupon-issue-active-check
fix/family-coupon-zero-clickable
fix/family-join-approval
fix/growth-grid-6col
fix/huawei-health-java8-compile
fix/huawei-status-json
fix/mp-undefined-template-props
fix/mp-weixin-key-bug
fix/product-tags-input
fix/report-date-editable-data-integrity
fix/u7-r3
fix/u7-rework
master
merge/c1-c2
merge/cfc-alldone-20261026
merge/cfclub-all-20261031
merge/hl03-final
merge/t19-nutrition-merge
recovered-1
recovered-2
recovered-3
recovered-4
recovered-5
refund-queue
report/dev1-0058
task/B-61
task/S-cfc-13
task/S-cfc-15
task/S-cfc-16
task/S-cfc-21
task/S-cfc-23
task/S-cfc-24
task/S-cfc-26
task/S-cfc-27
task/S-cfc-28
task/S-cfc-31
task/S-cfc-34
task/S-cfc-35
task/S-cfc-36
task/S-cfc-37
task/S-cfc-38
task/S-cfc-39
task/S-cfc-4
task/S-cfc-40
task/S-cfc-41
task/S-cfc-42
task/S-cfc-43
task/S-cfc-45
task/S-cfc-48
task/S-cfc-49
task/S-cfc-57
task/S-cfc-58
task/S-cfc-59
task/S-cfc-60
task/S-cfc-61
task/S-cfc-65
task/S-cfc-68
task/S-cfc-69
task/S-cfc-70
task/S-cfc-71
task/S-cfc-73
task/S-cfc-75
task/S-cfc-76
task/S-cfc-81
task/b24-merge
test/r83
verify/admin-wx-scan-login
verify/cfc-en-001
verify/coupon-c3-fix
verify/coupon-c3-fix-runtime
verify/t04-s2-gate
verify/t04-s2-gate2
verify/t28-fix-key-align
verify/t28-food-overview
verify/u7
verify/user-is-child
liaoxg
999b37d7ce
fix: 修复合并冲突残留
|
2 сар өмнө | |
|---|---|---|
| .. | ||
| index.vue | 999b37d7ce fix: 修复合并冲突残留 | 2 сар өмнө |