Merge remote-tracking branch 'origin/master'

zss

2024-08-06 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5

 performance-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOriginalHoursDto.java

@@ -7,12 +7,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.text.DecimalFormat;
import java.time.LocalDateTime;

@Data
//原始工时
public class AuxiliaryOriginalHoursDto {

    @ApiModelProperty("姓名")
    @ValueTableShow(2)
    @ExcelProperty(value = "姓名")