vault backup: 2025-07-08 20:54:04
Affected files:
.obsidian/app.json
.obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json
.obsidian/hotkeys.json
.obsidian/plugins/markdown-prettifier/data.json
Haina/Weekly/2025/2025-W11.md
Haina/Weekly/2025/2025-W13.md
Haina/Weekly/2025/2025-W16.md
Haina/Weekly/2025/2025-W17.md
Haina/Weekly/2025/2025-W30.md
Haina/分享&培训/面试.md
Haina/项目/HT数据分析/CT商旅数据统计.md
Haina/项目/支付中心/PayPal.md
Haina/项目/支付中心/连连-支付方式.md
WanderX/💡.md
Workspace/SpringTraveler.com/viator calendar - Google Gemini.sync-conflict-20250708-202617-5FF53Z3.mhtml
Workspace/SpringTraveler.com/产品.0708.xlsx
Workspace/SpringTraveler.com/账户.md
conflict-files-obsidian-git.md
main
Lei OT
3 months ago
parent
36e24eabe2
commit
aa438781bb
@ -1,24 +1,24 @@
|
|||||||
{
|
{
|
||||||
"legacyEditor": false,
|
"legacyEditor": false,
|
||||||
"livePreview": true,
|
"livePreview": true,
|
||||||
"promptDelete": false,
|
"promptDelete": false,
|
||||||
"attachmentFolderPath": "./atta",
|
"attachmentFolderPath": "./atta",
|
||||||
"pdfExportSettings": {
|
"pdfExportSettings": {
|
||||||
"includeName": true,
|
"includeName": true,
|
||||||
"pageSize": "A4",
|
"pageSize": "A4",
|
||||||
"landscape": false,
|
"landscape": false,
|
||||||
"margin": "0",
|
"margin": "0",
|
||||||
"downscalePercent": 100
|
"downscalePercent": 100
|
||||||
},
|
},
|
||||||
"showLineNumber": true,
|
"showLineNumber": true,
|
||||||
"fileSortOrder": "alphabetical",
|
"fileSortOrder": "alphabetical",
|
||||||
"newFileLocation": "current",
|
"newFileLocation": "current",
|
||||||
"newLinkFormat": "absolute",
|
"newLinkFormat": "absolute",
|
||||||
"useMarkdownLinks": true,
|
"useMarkdownLinks": true,
|
||||||
"alwaysUpdateLinks": true,
|
"alwaysUpdateLinks": true,
|
||||||
"defaultViewMode": "preview",
|
"defaultViewMode": "preview",
|
||||||
"showInlineTitle": true,
|
"showInlineTitle": true,
|
||||||
"tabSize": 2,
|
"tabSize": 2,
|
||||||
"propertiesInDocument": "visible",
|
"propertiesInDocument": "visible",
|
||||||
"newFileFolderPath": ""
|
"newFileFolderPath": ""
|
||||||
}
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
[
|
||||||
|
"obsidian-style-settings",
|
||||||
|
"obsidian-quiet-outline",
|
||||||
|
"obsidian-enhancing-mindmap",
|
||||||
|
"obsidian-auto-link-title",
|
||||||
|
"cm-editor-syntax-highlight-obsidian",
|
||||||
|
"emoji-shortcodes",
|
||||||
|
"obsidian-emoji-toolbar",
|
||||||
|
"obsidian-enhancing-export",
|
||||||
|
"obsidian-git",
|
||||||
|
"obsidian-pandoc",
|
||||||
|
"dataview",
|
||||||
|
"templater-obsidian",
|
||||||
|
"calendar",
|
||||||
|
"obsidian-tasks-plugin",
|
||||||
|
"periodic-notes",
|
||||||
|
"obsidian-excalidraw-plugin",
|
||||||
|
"text-snippets-obsidian",
|
||||||
|
"obsidian-list-callouts",
|
||||||
|
"obsidian-columns",
|
||||||
|
"obsidian-linter"
|
||||||
|
]
|
||||||
@ -1,144 +1,144 @@
|
|||||||
{
|
{
|
||||||
"insert-current-date": [
|
"insert-current-date": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": ";"
|
"key": ";"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"insert-current-time": [
|
"insert-current-time": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod",
|
"Mod",
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": ";"
|
"key": ";"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"workspace:split-vertical": [
|
"workspace:split-vertical": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": "\\"
|
"key": "\\"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"obsidian-auto-link-title:enhance-url-with-title": [
|
"obsidian-auto-link-title:enhance-url-with-title": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod",
|
"Mod",
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": "K"
|
"key": "K"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"markdown-prettifier:markdown-prettifier-run": [
|
"markdown-prettifier:markdown-prettifier-run": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod",
|
"Mod",
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": "S"
|
"key": "S"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Alt",
|
"Alt",
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": "F"
|
"key": "F"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"editor:toggle-bullet-list": [
|
"editor:toggle-bullet-list": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod",
|
"Mod",
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": "."
|
"key": "."
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"slides:start": [
|
"slides:start": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": "F5"
|
"key": "F5"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"templater-obsidian:jump-to-next-cursor-location": [
|
"templater-obsidian:jump-to-next-cursor-location": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": "Tab"
|
"key": "Tab"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"editor:toggle-numbered-list": [
|
"editor:toggle-numbered-list": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": "/"
|
"key": "/"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"editor:toggle-comments": [],
|
"editor:toggle-comments": [],
|
||||||
"command-palette:open": [
|
"command-palette:open": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod",
|
"Mod",
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": "P"
|
"key": "P"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"switcher:open": [
|
"switcher:open": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": "O"
|
"key": "O"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": "P"
|
"key": "P"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"markdown:add-metadata-property": [],
|
"markdown:add-metadata-property": [],
|
||||||
"editor:delete-paragraph": [],
|
"editor:delete-paragraph": [],
|
||||||
"advanced-cursors:add-next-match-to-selections": [
|
"advanced-cursors:add-next-match-to-selections": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": "D"
|
"key": "D"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"editor:toggle-strikethrough": [
|
"editor:toggle-strikethrough": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Mod"
|
"Mod"
|
||||||
],
|
],
|
||||||
"key": "-"
|
"key": "-"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"workspace:next-tab": [
|
"workspace:next-tab": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Ctrl"
|
"Ctrl"
|
||||||
],
|
],
|
||||||
"key": "PageDown"
|
"key": "PageDown"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"editor:toggle-source": [
|
"editor:toggle-source": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
"Alt",
|
"Alt",
|
||||||
"Shift"
|
"Shift"
|
||||||
],
|
],
|
||||||
"key": "E"
|
"key": "E"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"bullet": "-",
|
"bullet": "-",
|
||||||
"emphasis": "*",
|
"emphasis": "*",
|
||||||
"rule": "-",
|
"rule": "-",
|
||||||
"createHeaderIfNotPresent": true,
|
"createHeaderIfNotPresent": true,
|
||||||
"newHeaderTemplate": "Created: {{date:YYYY-MM-DD ddd}} ",
|
"newHeaderTemplate": "Created: {{date:YYYY-MM-DD ddd}} ",
|
||||||
"updateHeader": true,
|
"updateHeader": true,
|
||||||
"updateHeaderTemplate": "Updated: {{date:YYYY-MM-DD HH:mm ddd}} \n",
|
"updateHeaderTemplate": "Updated: {{date:YYYY-MM-DD HH:mm ddd}} \n",
|
||||||
"listItemIndent": "tab",
|
"listItemIndent": "tab",
|
||||||
"newlinesAroundHeadings": true
|
"newlinesAroundHeadings": true
|
||||||
}
|
}
|
||||||
@ -1,89 +1,89 @@
|
|||||||
---
|
---
|
||||||
Created: 2025-04-03 Thu
|
Created: 2025-04-03 Thu
|
||||||
Updated: 2025-04-03 17:10 Thu
|
Updated: 2025-04-03 17:10 Thu
|
||||||
---
|
---
|
||||||
|
|
||||||
| Logo | 支付方式 | 类型 | 主要流行国家/地区 | 技术参数代码 |
|
| Logo | 支付方式 | 类型 | 主要流行国家/地区 | 技术参数代码 |
|
||||||
| -------------------------------------------------------------------------------------- | ----- | ------------------------------------------------------------------------------------------ | ----------------- | ------ |
|
| -------------------------------------------------------------------------------------- | ----- | ------------------------------------------------------------------------------------------ | ----------------- | ------ |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Visa](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | inter_credit_card | |
|
| [Visa](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | inter_credit_card | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [MasterCard](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
| [MasterCard](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [American Express](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
| [American Express](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [JCB](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
| [JCB](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Discover](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
| [Discover](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Diners Club](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
| [Diners Club](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Union Pay](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
| [Union Pay](https://doc.lianlianpay.com/338488m0) | 国际卡 | 全球 | | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Afterpay](https://doc.lianlianpay.com/338717m0) | 先买后付 | 美国，加拿大，澳大利亚，新西兰 | afterpay | |
|
| [Afterpay](https://doc.lianlianpay.com/338717m0) | 先买后付 | 美国，加拿大，澳大利亚，新西兰 | afterpay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Apple Pay](https://doc.lianlianpay.com/338492m0) | 电子钱包 | 全球 | apple_pay | |
|
| [Apple Pay](https://doc.lianlianpay.com/338492m0) | 电子钱包 | 全球 | apple_pay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Google Pay](https://doc.lianlianpay.com/338502m0) | 电子钱包 | 全球 | google_pay | |
|
| [Google Pay](https://doc.lianlianpay.com/338502m0) | 电子钱包 | 全球 | google_pay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Klarna](https://doc.lianlianpay.com/338504m0) | 先买后付 | 澳大利亚、奥地利、比利时、加拿大、捷克、丹麦、芬兰、法国、德国、希腊、匈牙利、 爱尔兰、意大利、墨西哥、荷兰、挪威、波兰、葡萄牙、罗马尼亚、斯洛伐克、西班牙、瑞典、瑞士、英国、美国 | klarna | |
|
| [Klarna](https://doc.lianlianpay.com/338504m0) | 先买后付 | 澳大利亚、奥地利、比利时、加拿大、捷克、丹麦、芬兰、法国、德国、希腊、匈牙利、 爱尔兰、意大利、墨西哥、荷兰、挪威、波兰、葡萄牙、罗马尼亚、斯洛伐克、西班牙、瑞典、瑞士、英国、美国 | klarna | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Alipay CN](https://doc.lianlianpay.com/338490m0) | 电子钱包 | 中国 | alipay_cn | |
|
| [Alipay CN](https://doc.lianlianpay.com/338490m0) | 电子钱包 | 中国 | alipay_cn | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Alipay HK](https://doc.lianlianpay.com/338491m0) | 电子钱包 | 中国香港 | alipay_hk | |
|
| [Alipay HK](https://doc.lianlianpay.com/338491m0) | 电子钱包 | 中国香港 | alipay_hk | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [WeChat Pay](https://doc.lianlianpay.com/338521m0) | 电子钱包 | 中国 | wechat_pay | |
|
| [WeChat Pay](https://doc.lianlianpay.com/338521m0) | 电子钱包 | 中国 | wechat_pay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Konbini](https://doc.lianlianpay.com/338505m0) | 现金 | 日本 | konbini | |
|
| [Konbini](https://doc.lianlianpay.com/338505m0) | 现金 | 日本 | konbini | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Pay Easy](https://doc.lianlianpay.com/338514m0) | 现金 | 日本 | pay_easy | |
|
| [Pay Easy](https://doc.lianlianpay.com/338514m0) | 现金 | 日本 | pay_easy | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Kakao Pay](https://doc.lianlianpay.com/338503m0) | 电子钱包 | 韩国 | kakaopay | |
|
| [Kakao Pay](https://doc.lianlianpay.com/338503m0) | 电子钱包 | 韩国 | kakaopay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Naver Pay](https://doc.lianlianpay.com/338510m0) | 电子钱包 | 韩国 | naver_pay | |
|
| [Naver Pay](https://doc.lianlianpay.com/338510m0) | 电子钱包 | 韩国 | naver_pay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [PAYCO](https://doc.lianlianpay.com/338513m0) | 电子钱包 | 韩国 | payco | |
|
| [PAYCO](https://doc.lianlianpay.com/338513m0) | 电子钱包 | 韩国 | payco | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Akulaku](https://doc.lianlianpay.com/338489m0) | 先买后付 | 印度尼西亚 | akulaku_paylater | |
|
| [Akulaku](https://doc.lianlianpay.com/338489m0) | 先买后付 | 印度尼西亚 | akulaku_paylater | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [BNI](https://doc.lianlianpay.com/338493m0) | 银行转账 | 印度尼西亚 | bni | |
|
| [BNI](https://doc.lianlianpay.com/338493m0) | 银行转账 | 印度尼西亚 | bni | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [BRI](https://doc.lianlianpay.com/338497m0) | 银行转账 | 印度尼西亚 | bri | |
|
| [BRI](https://doc.lianlianpay.com/338497m0) | 银行转账 | 印度尼西亚 | bri | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [CIMB Clicks](https://doc.lianlianpay.com/338499m0) | 银行转账 | 印度尼西亚 | cimb_clicks | |
|
| [CIMB Clicks](https://doc.lianlianpay.com/338499m0) | 银行转账 | 印度尼西亚 | cimb_clicks | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [DANA](https://doc.lianlianpay.com/338500m0) | 电子钱包 | 印度尼西亚 | dana | |
|
| [DANA](https://doc.lianlianpay.com/338500m0) | 电子钱包 | 印度尼西亚 | dana | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Mandiri](https://doc.lianlianpay.com/338507m0) | 现金 | 印度尼西亚 | mandiri | |
|
| [Mandiri](https://doc.lianlianpay.com/338507m0) | 现金 | 印度尼西亚 | mandiri | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Maybank](https://doc.lianlianpay.com/338508m0) | 银行转账 | 印度尼西亚 | maybank | |
|
| [Maybank](https://doc.lianlianpay.com/338508m0) | 银行转账 | 印度尼西亚 | maybank | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Nobu Bank QRIS](https://doc.lianlianpay.com/338511m0) | 二维码支付 | 印度尼西亚 | nobu_bank_qris | |
|
| [Nobu Bank QRIS](https://doc.lianlianpay.com/338511m0) | 二维码支付 | 印度尼西亚 | nobu_bank_qris | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [OVO](https://doc.lianlianpay.com/338512m0) | 电子钱包 | 印度尼西亚 | ovo | |
|
| [OVO](https://doc.lianlianpay.com/338512m0) | 电子钱包 | 印度尼西亚 | ovo | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Permata](https://doc.lianlianpay.com/338515m0) | 银行转账 | 印度尼西亚 | permata | |
|
| [Permata](https://doc.lianlianpay.com/338515m0) | 银行转账 | 印度尼西亚 | permata | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Boost](https://doc.lianlianpay.com/338495m0) | 电子钱包 | 马来西亚 | boost | |
|
| [Boost](https://doc.lianlianpay.com/338495m0) | 电子钱包 | 马来西亚 | boost | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Mcash](https://doc.lianlianpay.com/338509m0) | 现金 | 马来西亚 | mcash | |
|
| [Mcash](https://doc.lianlianpay.com/338509m0) | 现金 | 马来西亚 | mcash | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Touch n Go](https://doc.lianlianpay.com/338519m0) | 电子钱包 | 马来西亚 | tng | |
|
| [Touch n Go](https://doc.lianlianpay.com/338519m0) | 电子钱包 | 马来西亚 | tng | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [BPI](https://doc.lianlianpay.com/338496m0) | 电子钱包 | 菲律宾 | bpi | |
|
| [BPI](https://doc.lianlianpay.com/338496m0) | 电子钱包 | 菲律宾 | bpi | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [GCash](https://doc.lianlianpay.com/338501m0) | 电子钱包 | 菲律宾 | gcash | |
|
| [GCash](https://doc.lianlianpay.com/338501m0) | 电子钱包 | 菲律宾 | gcash | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Bualuang iBanking](https://doc.lianlianpay.com/338498m0) | 银行转账 | 泰国 | bualuang_banking | |
|
| [Bualuang iBanking](https://doc.lianlianpay.com/338498m0) | 银行转账 | 泰国 | bualuang_banking | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Krungsri Online](https://doc.lianlianpay.com/338506m0) | 银行转账 | 泰国 | krungsri_online | |
|
| [Krungsri Online](https://doc.lianlianpay.com/338506m0) | 银行转账 | 泰国 | krungsri_online | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Prompt Pay](https://doc.lianlianpay.com/338517m0) | 银行转账 | 泰国 | prompt_pay | |
|
| [Prompt Pay](https://doc.lianlianpay.com/338517m0) | 银行转账 | 泰国 | prompt_pay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Rabbit LINE Pay](https://doc.lianlianpay.com/338518m0) | 电子钱包 | 泰国 | rabbit_line_pay | |
|
| [Rabbit LINE Pay](https://doc.lianlianpay.com/338518m0) | 电子钱包 | 泰国 | rabbit_line_pay | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [TrueMoney](https://doc.lianlianpay.com/338520m0) | 电子钱包 | 泰国 | truemoney | |
|
| [TrueMoney](https://doc.lianlianpay.com/338520m0) | 电子钱包 | 泰国 | truemoney | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Boleto](https://doc.lianlianpay.com/338494m0) | 现金 | 巴西 | boleto | |
|
| [Boleto](https://doc.lianlianpay.com/338494m0) | 现金 | 巴西 | boleto | |
|
||||||
|  | | | | |
|
|  | | | | |
|
||||||
| [Pix](https://doc.lianlianpay.com/338516m0) | 银行转账 | 巴西 | pix | |
|
| [Pix](https://doc.lianlianpay.com/338516m0) | 银行转账 | 巴西 | pix | |
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,10 +0,0 @@
|
|||||||
|
|
||||||
## 账户
|
|
||||||
|
|
||||||
| | | 账号 | 密码 |
|
|
||||||
| ------------------------------------------------------------------------------------------------------------ | ----- | --------------------- | ------------------------------------ |
|
|
||||||
| [WordPress](https://springtraveler.com/wp-login.php) | 商品管理员 | wp_admin | gljczj2025@ |
|
|
||||||
| | 管理员 | st_admin | |
|
|
||||||
| [GetYourGuide](https://www.getyourguide.supply/)<br>[Supply Partner](https://supplier.getyourguide.com/home) | | `zhuge2518@gmail.com` | KWP2Dxn3Xb#PEkp<br>*短信验证* |
|
|
||||||
| TripAdvisor & [Viator](https://supplier.viator.com/sign-up-info?m=62034) | | | swHsBWw&5E-2DPL<br><br> |
|
|
||||||
| Gmail | | `zhuge2518@gmail.com` | rdPa!JS5G*!6mNc <br>*验证器二次验证*<br> |
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
# Conflicts
|
|
||||||
Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`
|
|
||||||
(This file will automatically be deleted before commit)
|
|
||||||
[[#Additional Instructions]] available below file list
|
|
||||||
|
|
||||||
- Not a file: .obsidian/community-plugins.json
|
|
||||||
- [[Haina/Templates/W-log]]
|
|
||||||
- [[Haina/Weekly/2025/2025-W16]]
|
|
||||||
- [[Haina/Weekly/2025/2025-W17]]
|
|
||||||
- [[Haina/项目/HT数据分析/CT商旅数据统计]]
|
|
||||||
|
|
||||||
# Additional Instructions
|
|
||||||
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
|
|
||||||
|
|
||||||
```diff
|
|
||||||
<<<<<<< HEAD
|
|
||||||
File changes in local repository
|
|
||||||
=======
|
|
||||||
File changes in remote repository
|
|
||||||
>>>>>>> origin/main
|
|
||||||
```
|
|
||||||
Loading…
Reference in New Issue