Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2024-03-28 1a2258c4eca2e7514b6096004fa1c3e0036b402b

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

@@ -49,7 +49,7 @@
    @Excel(name = "创建时间", width = 20, 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")
    private Date createTime;
    private java.util.Date createTime;
   /**修改人*/
    @ApiModelProperty(value = "修改人")
    private String updateBy;