From 6bd4253be72e439101e79fc15174494387bf9586 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Tue, 14 Mar 2023 17:51:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix-3045' into fix-3168

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

diff --git a/src/test.txt b/src/test.txt
index 10120818..a77b8692 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-#3168 资源管理新建应用场景页面选全部资源池队列时应包含所有资源规格且不重复
+Merge remote-tracking branch 'origin/fix-3045' into fix-3168