From 612172aacb1b05162270ff846441f1c6336d0321 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 03 十一月 2026 22:02:49 +0800
Subject: [PATCH] fix(hrm): 缺勤扣款计薪基数改为基本+岗位+工龄+绩效
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
index f28e95d..26c6ab7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/vo/HrmAttendanceRuleRespVO.java
@@ -59,6 +59,20 @@
@Schema(description = "鐢熸晥缁撴潫鏃ユ湡锛堢┖琛ㄧず涓嶉檺锛�")
@ExcelProperty("鐢熸晥缁撴潫鏃ユ湡")
private LocalDate effectiveEndDate;
+ @Schema(description = "鎵撳崱鍦扮偣鍚嶇О")
+ private String locationName;
+ @Schema(description = "鎵撳崱鍦扮偣鍦板潃")
+ private String locationAddress;
+ @Schema(description = "鍦扮偣缁忓害锛圵GS84锛�")
+ private BigDecimal longitude;
+ @Schema(description = "鍦扮偣绾害锛圵GS84锛�")
+ private BigDecimal latitude;
+ @Schema(description = "鍏佽鎵撳崱鍗婂緞锛屽崟浣嶇背")
+ private Integer radiusMeters;
+ @Schema(description = "鏄惁鍚敤浣嶇疆闄愬埗")
+ private Boolean locationRequired;
+ @Schema(description = "鍧愭爣绯伙紝浠呮敮鎸� WGS84")
+ private String coordinateSystem;
@Schema(description = "鐘舵�侊細0-鍚敤锛�1-绂佺敤")
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@@ -73,4 +87,4 @@
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3