From bb6bd0aa3922390b8649efc2470223b1908bb835 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:08 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=94=A8=E6=88=B7=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=E5=8E=BB=E6=8E=89=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8A=E6=9C=AA=E6=BF=80=E6=B4=BB=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=82'=20(#797)=20from=20zouap=5Fstatic?=
 =?UTF-8?q?=20into=20V20211115?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test.txt b/src/test.txt
index 0a76b39a..c0ae81da 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20211115' into liuzx_trainjob
+Merge pull request '提交代码，用户看板界面增加分页查询用户信息接口，同时去掉组织用户及未激活的用户。' (#797) from zouap_static into V20211115