From 2749626492862339a50789933bb110f691426225 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 07 八月 2024 16:40:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java index 481d2e8..0fb7f18 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java @@ -1,6 +1,7 @@ package com.ruoyi.other.api.domain; import com.baomidou.mybatisplus.annotation.*; +import com.ruoyi.common.core.web.domain.BasePojo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,7 +22,7 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_invoice_type") @ApiModel(value="TInvoiceType对象", description="") -public class TInvoiceType implements Serializable { +public class TInvoiceType extends BasePojo { private static final long serialVersionUID = 1L; @@ -53,14 +54,7 @@ @TableField("added_service_tariff") private Double addedServiceTariff; - @ApiModelProperty(value = "删除状态(0=否,1=是)") - @TableField("del_flag") - @TableLogic - private Integer delFlag; - @ApiModelProperty(value = "添加时间") - @TableField("create_time") - private LocalDateTime createTime; } -- Gitblit v1.7.1