From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突

---
 Service/HStation.Service.WE.Core/03-settings/01-paras/02-cal/Paras_WE_CAL.cs |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Service/HStation.Service.WE.Core/03-settings/01-paras/02-cal/Paras_Equivalent_CAL.cs b/Service/HStation.Service.WE.Core/03-settings/01-paras/02-cal/Paras_WE_CAL.cs
similarity index 100%
rename from Service/HStation.Service.WE.Core/03-settings/01-paras/02-cal/Paras_Equivalent_CAL.cs
rename to Service/HStation.Service.WE.Core/03-settings/01-paras/02-cal/Paras_WE_CAL.cs

--
Gitblit v1.9.3