Merge remote-tracking branch 'git/main'

# Conflicts:
#	.obsidian/snippets/color.css
#	Haina/Weekly/2025/2025-W16.md
#	Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html

.obsidian/snippets/color.css

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .blue .cm-line.HyperMD-codeblock{
   background-color: #daedfc;
 }

Haina/Weekly/2025/2025-W16.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ---
 Created: 2025-04-08 Tue
 Updated: 2025-04-15 17:27 Tue

Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html

@@ -1173,6 +1173,7 @@ pre[class*="language-"] {
       list-style-type: decimal;
     }
   </style>
+<<<<<<< HEAD
   <style>.markdown-body a.footnote-ref {
   text-decoration: none;
 }