From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1

---
 .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