Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-08-08 384698a3568b3ab723843b4e48fdd188c3640aa0

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.mes.base.entity.BigStorageCageBaseInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -91,4 +92,7 @@
     */
    @ApiModelProperty(value = "工程id", position = 17)
    private String engineerId;

    @TableLogic
    private int deleted;
}