Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-15 a66b4925a2528ff23a34c3607e9c45bbbdd28e5e

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

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

import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

/**
 * <p>
@@ -31,7 +33,11 @@

    private Integer status;

    private Integer line;

    private Date time;

    @TableLogic
    private int deleted;

}