From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 14 十月 2025 16:34:22 +0800 Subject: [PATCH] 改bug --- server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java index ccf1673..35d5149 100644 --- a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java +++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.doumee.core.annotation.excel.ExcelColumn; -import com.doumee.core.model.LoginUserModel; +import com.doumee.service.business.third.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -43,7 +43,8 @@ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�") @ExcelColumn(name="鏇存柊浜虹紪鐮�") private Integer editor; - + @ApiModelProperty(value = "濮撳悕鎷奸煶棣栧瓧姣�") + private String pinyin; @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") private Date editDate; @@ -76,8 +77,8 @@ @ExcelColumn(name="鍥炬爣") private String imgurl; - @ApiModelProperty(value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐") - @ExcelColumn(name="绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐") + @ApiModelProperty(value = "绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐") + @ExcelColumn(name="绫诲瀷 0鐩稿叧鏂瑰叕鍙� 1鍐呴儴缁勭粐") private Integer type; @ApiModelProperty(value = "鍒嗙被缂栫爜(鍏宠仈category)") @@ -190,7 +191,13 @@ @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆璺緞", example = "1") @TableField(exist = false) private String parentCompanyPath; + @ApiModelProperty(value = "鐖剁骇閮ㄩ棬绾у埆绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", example = "1") + @TableField(exist = false) + private String parentType; @ApiModelProperty(value = "erp閮ㄩ棬绾у埆璺緞", example = "1") @ExcelColumn(name="erp閮ㄩ棬绾у埆璺緞") private String erpCompanyPath; + @ApiModelProperty(value = "鍙煡璇㈤殣鎮i厤缃儴闂細0=鍚︼紱1=鏄�", example = "1") + @TableField(exist = false) + private Integer queryHiddenDanger; } -- Gitblit v1.9.3