From e95e5dbf63cf7507c27ecc8d1470f57e6cc14c2d Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 16 May 2025 20:33:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_holiday/models/inherit_hr_leave.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 83c95a8d9..44ae47f4e 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -426,7 +426,7 @@ class HolidaysRequestBatch(models.Model):
                 start_time = first_hour_leave.request_hour_from
                 end_time = first_hour_leave.request_hour_to
                 hours = first_hour_leave.number_of_hours_text if first_hour_leave.number_of_hours_text else 0
-                title = f"{self.employee_id.name}的休假 {date_str},{start_time}-{end_time}"
+                title = f"{self.employee_id.name}的休假 {date_str},{start_time}~{end_time}"
                 if hours:
                     title += f",{hours}"
                 self.name = title
@@ -434,7 +434,7 @@ class HolidaysRequestBatch(models.Model):
                 # 只按天请假的情况
                 start_date_str = self.start_date.strftime('%Y-%m-%d')
                 end_date_str = self.end_date.strftime('%Y-%m-%d')
-                self.name = f"{self.employee_id.name}的请假 {start_date_str}-{end_date_str}"
+                self.name = f"{self.employee_id.name}的请假 {start_date_str}~{end_date_str}"
             elif self.leave_ids and self.hour_leave_ids:
                 # 混合请假的情况
                 start_date_str = self.start_date.strftime('%Y-%m-%d')

From 7218430b90b71e55751f75776eeb721e67ebd0bd Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 16 May 2025 20:33:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_holiday/models/inherit_hr_leave.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py
index 44ae47f4e..334cfa813 100644
--- a/yuthon_holiday/models/inherit_hr_leave.py
+++ b/yuthon_holiday/models/inherit_hr_leave.py
@@ -426,7 +426,7 @@ class HolidaysRequestBatch(models.Model):
                 start_time = first_hour_leave.request_hour_from
                 end_time = first_hour_leave.request_hour_to
                 hours = first_hour_leave.number_of_hours_text if first_hour_leave.number_of_hours_text else 0
-                title = f"{self.employee_id.name}的休假 {date_str},{start_time}~{end_time}"
+                title = f"{self.employee_id.name}的请假 {date_str},{start_time}~{end_time}"
                 if hours:
                     title += f",{hours}"
                 self.name = title