yun-zhi-ztl a6cf862e8e merge(main): sync latest origin/main into feature/project-review ... Resolved 9 conflicts according to documented strategy: - .gitignore: kept both entries (docs/review/ + CLAUDE.md) - ClawHubCompatController.java: manual merge (use @AuthenticationPrincipal + platformRoles) - ClawHubCompatControllerTest.java: kept ours (HEAD security tests) - CliControllerTest.java: kept ours (HEAD platform roles tests) - ReviewPermissionChecker.java: kept ours (stricter permission model) - SkillPublishService.java: kept theirs (main SUPER_ADMIN bypass + events) - SkillPublishServiceTest.java: kept theirs (main complete test suite) - router.tsx: manual merge (HEAD's createLazyRouteComponent + main's privacy/terms) - markdown-renderer.tsx: kept ours (HEAD frontmatter stripping + styles) All A1-A9 security fixes preserved. No new logic introduced.		2026-03-14 17:50:38 +08:00
..
main/java/com/iflytek/skillhub/storage	merge(main): sync latest origin/main into feature/project-review	2026-03-14 17:50:38 +08:00
test/java/com/iflytek/skillhub/storage	merge(main): sync latest origin/main into feature/project-review	2026-03-13 12:49:12 +08:00