Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-16 503c45f8fd117ca58d56dcaceb44d8f95b3e2527

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

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

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

@@ -36,4 +37,7 @@

    private Date time;

    @TableLogic
    private int deleted;

}