From f562522e5d09b7be8bed1d5bf85029715b5b09ce Mon Sep 17 00:00:00 2001
From: YuanHui <31339626+alsesa@users.noreply.github.com>
Date: Wed, 25 Dec 2024 07:33:52 +0800
Subject: [PATCH] [logseq-plugin-git:commit] 2024-12-24T23:33:52.762Z

---
 journals/2024_12_25.md | 1 +
 pages/倦怠社会.md      | 5 +++++
 pages/规训社会.md      | 2 ++
 3 files changed, 8 insertions(+)
 create mode 100644 journals/2024_12_25.md
 create mode 100644 pages/倦怠社会.md
 create mode 100644 pages/规训社会.md

diff --git a/journals/2024_12_25.md b/journals/2024_12_25.md
new file mode 100644
index 0000000..6c19c55
--- /dev/null
+++ b/journals/2024_12_25.md
@@ -0,0 +1 @@
+- [[倦怠社会]]
\ No newline at end of file
diff --git a/pages/倦怠社会.md b/pages/倦怠社会.md
new file mode 100644
index 0000000..44b223c
--- /dev/null
+++ b/pages/倦怠社会.md
@@ -0,0 +1,5 @@
+- [[规训社会]]
+	- Disziplinargesellschaft
+	- 由医院、疯人院、监狱、营房和工厂构成
+- [[功绩社会]]
+	- 由健身房、办公楼、银行、机场、购物中心和基因实验室建构的社会。
\ No newline at end of file
diff --git a/pages/规训社会.md b/pages/规训社会.md
new file mode 100644
index 0000000..0223efc
--- /dev/null
+++ b/pages/规训社会.md
@@ -0,0 +1,2 @@
+- Disziplinargesellschaft
+-
\ No newline at end of file