From fa61872c58fca1de27241ba2fe7aeb429fe63aa0 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:40:45 +0800
Subject: [PATCH] Merge branch 'V20211213' into zouap

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index 3dd88b9e..f6fa3bfc 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '解决：#1086， 后端返回界面编辑权限的界面是否可以操作。' (#1093) from zouap into V20211213
+Merge branch 'V20211213' into zouap