From d1cc113ac2ce39f6a06ab0a838ccf538766580c2 Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期三, 26 三月 2025 17:52:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into xizang-changyun --- ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java index 3132361..70a3e56 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java @@ -1,12 +1,9 @@ package com.ruoyi.system.model; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseModel; import io.swagger.annotations.ApiModel; @@ -16,6 +13,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; /** * <p> @@ -79,4 +77,8 @@ @TableField(exist = false) private Integer viewCount; + @ApiModelProperty(value = "营业部id") + @TableField("business_dept_id") + private String businessDeptId; + } -- Gitblit v1.7.1