From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 18 十月 2023 11:27:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java index 1d0f72b..38750a2 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,6 +45,7 @@ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1") @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") + @TableLogic private Integer isdeleted; @ApiModelProperty(value = "鍚嶇О") -- Gitblit v1.9.3