Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java

@@ -1,13 +1,13 @@
package com.mes.edgglasstask.entity;

import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.sf.jsqlparser.expression.DateTimeLiteralExpression;

import java.io.Serializable;
import java.util.Date;

/**
 * <p>
@@ -73,6 +73,9 @@
     * 线路
     */
    @ApiModelProperty(value = "时间", position = 9)
    private DateTime time;
    private Date time;

    @TableLogic
    private int deleted;

}