diff --git a/.gitignore b/.gitignore index 48f777f..b96c15c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -**/workspace.json +/.obsidian/workspace*.json diff --git a/.obsidian/workspace.sync-conflict-20230723-231320-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-231320-V2E5V32.json deleted file mode 100644 index 68b586d..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-231320-V2E5V32.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "261f2ba07228ef80", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "conflict-files-obsidian-git.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 3 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5 - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "Daily Logs/2021-2023 汇总.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "259e241c478a6447", - "lastOpenFiles": [ - "Daily Logs/2021-2023.md", - "Daily Logs/2021-2023 汇总.md", - "conflict-files-obsidian-git.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230723-232301-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-232301-V2E5V32.json deleted file mode 100644 index 69f8fad..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-232301-V2E5V32.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "261f2ba07228ef80", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "conflict-files-obsidian-git.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 2 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5 - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "bf9baac16852fcdd", - "lastOpenFiles": [ - "Daily Logs/2021-2023 汇总.md", - "Daily Logs/2021-2023 重点工作.md", - "conflict-files-obsidian-git.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230723-232411-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-232411-V2E5V32.json deleted file mode 100644 index b2bf7bb..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-232411-V2E5V32.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 2 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "259e241c478a6447", - "lastOpenFiles": [ - "Daily Logs/2021-2023 汇总.md", - "Daily Logs/2021-2023 重点工作.md", - "Platform/_sidebar.md", - "conflict-files-obsidian-git.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230723-232621-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-232621-V2E5V32.json deleted file mode 100644 index 1515665..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-232621-V2E5V32.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 1 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "Daily Logs/2021-2023 汇总.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "bf9baac16852fcdd", - "lastOpenFiles": [ - "conflict-files-obsidian-git.md", - "Daily Logs/2021-2023 汇总.md", - "Daily Logs/2021-2023 重点工作.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230723-233351-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-233351-V2E5V32.json deleted file mode 100644 index 49f4f36..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-233351-V2E5V32.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 1 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "Daily Logs/2021-2023 汇总.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "bf9baac16852fcdd", - "lastOpenFiles": [ - "Daily Logs/2021-2023 重点工作.md", - "Daily Logs/2021-2023 汇总.md", - "conflict-files-obsidian-git.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230723-233611-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-233611-V2E5V32.json deleted file mode 100644 index 1515665..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-233611-V2E5V32.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 1 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "Daily Logs/2021-2023 汇总.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "bf9baac16852fcdd", - "lastOpenFiles": [ - "conflict-files-obsidian-git.md", - "Daily Logs/2021-2023 汇总.md", - "Daily Logs/2021-2023 重点工作.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230723-233851-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-233851-V2E5V32.json deleted file mode 100644 index 1515665..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-233851-V2E5V32.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 1 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "Daily Logs/2021-2023 汇总.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "bf9baac16852fcdd", - "lastOpenFiles": [ - "conflict-files-obsidian-git.md", - "Daily Logs/2021-2023 汇总.md", - "Daily Logs/2021-2023 重点工作.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230723-235722-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230723-235722-V2E5V32.json deleted file mode 100644 index 9c8a626..0000000 --- a/.obsidian/workspace.sync-conflict-20230723-235722-V2E5V32.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "e1b02b70db53ef90", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "conflict-files-obsidian-git.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 2 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "conflict-files-obsidian-git.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "conflict-files-obsidian-git.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "e1b02b70db53ef90", - "lastOpenFiles": [ - "Daily Logs/2021-2023 汇总.md", - "conflict-files-obsidian-git.md", - "Daily Logs/2021-2023 重点工作.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230724-001733-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230724-001733-V2E5V32.json deleted file mode 100644 index df8e6b8..0000000 --- a/.obsidian/workspace.sync-conflict-20230724-001733-V2E5V32.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "f7b0535cb4ca7772", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "conflict-files-obsidian-git.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 2 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "conflict-files-obsidian-git.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "conflict-files-obsidian-git.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "f7b0535cb4ca7772", - "lastOpenFiles": [ - "Daily Logs/2021-2023 汇总.md", - "conflict-files-obsidian-git.md", - "Daily Logs/2021-2023 重点工作.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Daily Logs/FD-KPI.md", - "Daily Logs/FD-Task3.md", - "Platform/供应商付款/M 2022-08-10.md", - "Platform/供应商付款/ℹINFO.md", - "Platform/订单/刷单系统流程.md", - "Platform/财务/账单管理.md", - "Platform/财务/核算工具.md", - "Platform/财务/财务报表.md", - "Platform/产品管理/产品供应商-操作规范.md", - "Platform/产品管理/供应商信息维护.md", - "Platform/订单/批量导入订单.md", - "Platform/供应商付款/(预付款, 借款) - 退余额.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file diff --git a/.obsidian/workspace.sync-conflict-20230724-023421-V2E5V32.json b/.obsidian/workspace.sync-conflict-20230724-023421-V2E5V32.json deleted file mode 100644 index c5a0ddf..0000000 --- a/.obsidian/workspace.sync-conflict-20230724-023421-V2E5V32.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "main": { - "id": "7a0da73135186e4a", - "type": "split", - "children": [ - { - "id": "d204a8cb6691c7ce", - "type": "tabs", - "children": [ - { - "id": "d70b59299e9845a8", - "type": "leaf", - "pinned": true, - "state": { - "type": "markdown", - "state": { - "file": "Platform/_sidebar.md", - "mode": "preview", - "source": false - }, - "pinned": true - } - }, - { - "id": "bf9baac16852fcdd", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 汇总.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "38292b456cc73ac4", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "conflict-files-obsidian-git.md", - "mode": "preview", - "source": false - } - } - }, - { - "id": "259e241c478a6447", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Daily Logs/2021-2023 重点工作.md", - "mode": "source", - "source": false - } - } - } - ], - "currentTab": 2 - } - ], - "direction": "vertical" - }, - "left": { - "id": "c5fdf34fc5ea4c81", - "type": "split", - "children": [ - { - "id": "3841756efe3c6ac7", - "type": "tabs", - "children": [ - { - "id": "5801f06d531416f4", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical" - } - } - }, - { - "id": "5023b14b5c34ee75", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - } - } - }, - { - "id": "f1a7f23ea67f297e", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 239.5, - "collapsed": true - }, - "right": { - "id": "0686d5809616308a", - "type": "split", - "children": [ - { - "id": "d9d38115cfe2d18f", - "type": "tabs", - "dimension": 41.594620557156574, - "children": [ - { - "id": "10d9387b227d46e7", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "file": "conflict-files-obsidian-git.md" - } - } - }, - { - "id": "dd216b2b73331057", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "file": "conflict-files-obsidian-git.md", - "collapseAll": true, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false - } - } - } - ] - }, - { - "id": "9a8ed0fe1b835302", - "type": "tabs", - "dimension": 29.298751200768493, - "children": [ - { - "id": "57e3139825373ef9", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": false - } - } - }, - { - "id": "1691261710549c45", - "type": "leaf", - "state": { - "type": "advanced-tables-toolbar", - "state": {} - } - } - ], - "currentTab": 1 - }, - { - "id": "75cbdb8739f6ae25", - "type": "tabs", - "dimension": 29.106628242074926, - "children": [ - { - "id": "04ddb8195641483f", - "type": "leaf", - "state": { - "type": "git-view", - "state": {} - } - } - ] - } - ], - "direction": "horizontal", - "width": 233.5 - }, - "left-ribbon": { - "hiddenItems": { - "switcher:打开快速切换": false, - "graph:查看关系图谱": false, - "canvas:新建白板": false, - "daily-notes:打开/创建今天的日记": false, - "templates:插入模板": false, - "command-palette:打开命令面板": false, - "markdown-importer:打开 Markdown 格式转换器": false, - "zk-prefixer:创建时间戳笔记": false, - "table-editor-obsidian:Advanced Tables Toolbar": false, - "dbfolder:创建一个新数据库表": false, - "templater-obsidian:Templater": false - } - }, - "active": "38292b456cc73ac4", - "lastOpenFiles": [ - "Templates/DailyLogs_REMOTE_570.md", - "Templates/DailyLogs_LOCAL_570.md", - "Templates/DailyLogs_BASE_570.md", - "Templates/DailyLogs_BACKUP_570.md", - "Daily Logs/2023.07_REMOTE_570.md", - "Daily Logs/2023.07_LOCAL_570.md", - "Daily Logs/2023.07_BASE_570.md", - "Daily Logs/2023.07_BACKUP_570.md", - "Daily Logs/2023.06 考核_REMOTE_570.md", - "Daily Logs/2023.06 考核_LOCAL_570.md", - "Daily Logs/2023.06 考核_BASE_570.md", - "Daily Logs/2023.06 考核_BACKUP_570.md", - "Daily Logs/2021-2023 汇总.md", - "conflict-files-obsidian-git.md", - "Daily Logs/2021-2023 重点工作.md", - "Platform/_sidebar.md", - "Templates/DailyLogs.md", - "Templates", - "Daily Logs/2023.07.md", - "Daily Logs/fd-kpi.md", - "Daily Logs/2023.06 考核.md", - "Daily Logs", - "Daily Logs/2023-07-17.md", - "未命名.canvas", - "Templates/任务.md", - "Platform/供应商付款/(预付款, 借款) - 销账.md", - "Platform/订单/团款认领.md", - "Platform/需求/财务-U8对接.md", - "Daily Logs/财务.md", - "Platform/需求", - "Koala/atta/Pasted image 20230515161111.png", - "Platform/atta/Snipaste_2023-03-20_09-36-39.png", - "Platform/组团计划" - ] -} \ No newline at end of file