Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-10 bd56825b00f131000b721f4fa2e4619c56a612a0

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java

@@ -69,10 +69,11 @@
    @Excel(name = "点检人", width = 15)
    @ApiModelProperty(value = "点检人")
    private String inspector;
    /**点检时间*/
    @Excel(name = "点检时间", width = 15)
    @Excel(name = "点检时间（实际）", width = 15, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "点检时间")
    private String inspectTime;
    private Date inspectTime;

    public EamWeekInspectionDetail(){}