From 827cda96e65856b3b83c2a9b0fe418bd7ec48e94 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 09 八月 2024 16:28:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java
index 570c382..1e615c7 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryWorkingHours.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -40,7 +41,7 @@
private String auxiliaryProject;
@ValueTableShow(5)
@ApiModelProperty("鏍稿噯宸ユ椂")
- private Float approvedWorkingHour;
+ private Double approvedWorkingHour;
@ValueTableShow(7)
@ApiModelProperty("澶囨敞")
private String remarks;
--
Gitblit v1.9.3