From 262f97f737bf71a42dc58954056d567f292db0d1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 15 四月 2024 14:59:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_xp'

---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb0afcd..e1df71b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 !*/build/*.xml
 
 
+/鑷础ui/

--
Gitblit v1.8.0