From 23adbd6fd679e293c4c8118713b9e1e8b0a463bb Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期三, 17 七月 2024 16:11:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryCorrectionHours.java | 66 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryCorrectionHours.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryCorrectionHours.java
index 2880070..9d59780 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryCorrectionHours.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryCorrectionHours.java
@@ -30,8 +30,6 @@
@ApiModel(value = "AuxiliaryCorrectionHours瀵硅薄", description = "宸ユ椂缁熻鐨勪慨姝ｅ伐鏃�")
public class AuxiliaryCorrectionHours extends OrderBy implements Serializable {
- private static final long serialVersionUID = 1L;
-
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@@ -43,157 +41,157 @@
@ExcelProperty(value = "绫诲瀷")
private String type;
- @ApiModelProperty("1鏃ュ伐鏃�")
+ @ApiModelProperty("1鏃�")
@ValueTableShow(4)
@ExcelProperty(value = "1鏃�")
private Double oneHours;
- @ApiModelProperty("2鏃ュ伐鏃�")
+ @ApiModelProperty("2鏃�")
@ValueTableShow(5)
@ExcelProperty(value = "2鏃�")
private Double twoHours;
- @ApiModelProperty("3鏃ュ伐鏃�")
+ @ApiModelProperty("3鏃�")
@ValueTableShow(6)
@ExcelProperty(value = "3鏃�")
private Double threeHours;
- @ApiModelProperty("4鏃ュ伐鏃�")
+ @ApiModelProperty("4鏃�")
@ValueTableShow(7)
@ExcelProperty(value = "4鏃�")
private Double fourHours;
- @ApiModelProperty("5鏃ュ伐鏃�")
+ @ApiModelProperty("5鏃�")
@ValueTableShow(8)
@ExcelProperty(value = "5鏃�")
private Double fiveHours;
- @ApiModelProperty("6鏃ュ伐鏃�")
+ @ApiModelProperty("6鏃�")
@ValueTableShow(9)
@ExcelProperty(value = "6鏃�")
private Double sixHours;
- @ApiModelProperty("7鏃ュ伐鏃�")
+ @ApiModelProperty("7鏃�")
@ValueTableShow(10)
@ExcelProperty(value = "7鏃�")
private Double sevenHours;
- @ApiModelProperty("8鏃ュ伐鏃�")
+ @ApiModelProperty("8鏃�")
@ValueTableShow(11)
@ExcelProperty(value = "8鏃�")
private Double eightHours;
- @ApiModelProperty("9鏃ュ伐鏃�")
+ @ApiModelProperty("9鏃�")
@ValueTableShow(12)
@ExcelProperty(value = "9鏃�")
private Double nineHours;
- @ApiModelProperty("10鏃ュ伐鏃�")
+ @ApiModelProperty("10鏃�")
@ValueTableShow(13)
@ExcelProperty(value = "10鏃�")
private Double tenHours;
- @ApiModelProperty("11鏃ュ伐鏃�")
+ @ApiModelProperty("11鏃�")
@ValueTableShow(14)
@ExcelProperty(value = "11鏃�")
private Double elevenHours;
- @ApiModelProperty("12鏃ュ伐鏃�")
+ @ApiModelProperty("12鏃�")
@ValueTableShow(15)
@ExcelProperty(value = "12鏃�")
private Double twelveHours;
- @ApiModelProperty("13鏃ュ伐鏃�")
+ @ApiModelProperty("13鏃�")
@ValueTableShow(16)
@ExcelProperty(value = "13鏃�")
private Double thirteenHours;
- @ApiModelProperty("14鏃ュ伐鏃�")
+ @ApiModelProperty("14鏃�")
@ValueTableShow(17)
@ExcelProperty(value = "14鏃�")
private Double fourteenHours;
- @ApiModelProperty("15鏃ュ伐鏃�")
+ @ApiModelProperty("15鏃�")
@ValueTableShow(18)
@ExcelProperty(value = "15鏃�")
private Double fifteenHours;
- @ApiModelProperty("16鏃ュ伐鏃�")
+ @ApiModelProperty("16鏃�")
@ValueTableShow(19)
@ExcelProperty(value = "16鏃�")
private Double sixteenHours;
- @ApiModelProperty("17鏃ュ伐鏃�")
+ @ApiModelProperty("17鏃�")
@ValueTableShow(20)
@ExcelProperty(value = "17鏃�")
private Double seventeenHours;
- @ApiModelProperty("18鏃ュ伐鏃�")
+ @ApiModelProperty("18鏃�")
@ValueTableShow(21)
@ExcelProperty(value = "18鏃�")
private Double eighteenHours;
- @ApiModelProperty("19鏃ュ伐鏃�")
+ @ApiModelProperty("19鏃�")
@ValueTableShow(22)
@ExcelProperty(value = "19鏃�")
private Double nineteenHours;
- @ApiModelProperty("20鏃ュ伐鏃�")
+ @ApiModelProperty("20鏃�")
@ValueTableShow(23)
@ExcelProperty(value = "20鏃�")
private Double twentyHours;
- @ApiModelProperty("21鏃ュ伐鏃�")
+ @ApiModelProperty("21鏃�")
@ValueTableShow(24)
@ExcelProperty(value = "21鏃�")
private Double twentyOneHours;
- @ApiModelProperty("22鏃ュ伐鏃�")
+ @ApiModelProperty("22鏃�")
@ValueTableShow(25)
@ExcelProperty(value = "22鏃�")
private Double twentyTwoHours;
- @ApiModelProperty("23鏃ュ伐鏃�")
+ @ApiModelProperty("23鏃�")
@ValueTableShow(26)
@ExcelProperty(value = "23鏃�")
private Double twentyThreeHours;
- @ApiModelProperty("24鏃ュ伐鏃�")
+ @ApiModelProperty("24鏃�")
@ValueTableShow(27)
@ExcelProperty(value = "24鏃�")
private Double twentyFourHours;
- @ApiModelProperty("25鏃ュ伐鏃�")
+ @ApiModelProperty("25鏃�")
@ValueTableShow(28)
@ExcelProperty(value = "25鏃�")
private Double twentyFiveHours;
- @ApiModelProperty("26鏃ュ伐鏃�")
+ @ApiModelProperty("26鏃�")
@ValueTableShow(29)
@ExcelProperty(value = "26鏃�")
private Double twentySixHours;
- @ApiModelProperty("27鏃ュ伐鏃�")
+ @ApiModelProperty("27鏃�")
@ValueTableShow(30)
@ExcelProperty(value = "27鏃�")
private Double twentySevenHours;
- @ApiModelProperty("28鏃ュ伐鏃�")
+ @ApiModelProperty("28鏃�")
@ValueTableShow(31)
@ExcelProperty(value = "28鏃�")
private Double twentyEightHours;
- @ApiModelProperty("29鏃ュ伐鏃�")
+ @ApiModelProperty("29鏃�")
@ValueTableShow(32)
@ExcelProperty(value = "29鏃�")
private Double twentyNineHours;
- @ApiModelProperty("30鏃ュ伐鏃�")
+ @ApiModelProperty("30鏃�")
@ValueTableShow(33)
@ExcelProperty(value = "30鏃�")
private Double thirtyHours;
- @ApiModelProperty("31鏃ュ伐鏃�")
+ @ApiModelProperty("31鏃�")
@ValueTableShow(34)
@ExcelProperty(value = "31鏃�")
private Double thirtyOneHours;
@@ -201,7 +199,7 @@
@ApiModelProperty("鏈堜唤")
@ValueTableShow(35)
@ExcelProperty(value = "鏈堜唤")
- private LocalDateTime month;
+ private String month;
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3