From beadecb2bbc75b8f153d366df11246719cf97b2f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 23 二月 2024 14:37:25 +0800
Subject: [PATCH] Merge branch 'dev-hxb' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev-hxb

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

diff --git a/.gitignore b/.gitignore
index 43124f4..fac7ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@
 
 
 local.properties
+.idea/workspace.xml
+.idea/
+*.properties

--
Gitblit v1.8.0