From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 02 四月 2024 17:05:57 +0800 Subject: [PATCH] mrshi --- server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java index e8d0003..55a59c9 100644 --- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java +++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java @@ -1,5 +1,6 @@ package com.doumee.dao.business.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,17 +9,20 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 浼佷笟鍙敤淇濋櫓鏂规鍏宠仈琛� * @author 姹熻箘韫� - * @date 2024/01/15 15:07 + * @date 2024/01/16 10:03 */ @Data @ApiModel("浼佷笟鍙敤淇濋櫓鏂规鍏宠仈琛�") @TableName("`company_solution`") -public class CompanySolution { +public class CompanySolution implements Serializable { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -31,7 +35,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -40,7 +44,7 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @@ -63,8 +67,8 @@ @ExcelColumn(name="鎺掑簭鐮�") private Integer sortnum; - @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攕olution_base锛�", example = "1") - @ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攕olution_base锛�") + @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛� 鍩鸿〃鏁版嵁", example = "1") + @ExcelColumn(name="鏂规缂栫爜锛堝叧鑱攕olutions锛夊熀琛ㄦ暟鎹�") private Integer solutionBaseId; @ApiModelProperty(value = "鏄惁鍙姞淇� 0鍚� 1鏄�", example = "1") @@ -74,5 +78,19 @@ @ApiModelProperty(value = "鏄惁鍙噺淇� 0鍚� 1鏄�", example = "1") @ExcelColumn(name="鏄惁鍙噺淇� 0鍚� 1鏄�") private Integer canReduce; + @ApiModelProperty(value = "鏂规鍚嶇О" ) + @TableField(exist = false) + private String solutionName ; + + + @ApiModelProperty(value = "鏂规涓婚敭锛堝叧鑱攕olutions锛�", example = "1") + @ExcelColumn(name="鏂规涓婚敭锛堝叧鑱攕olutions锛�") + private Integer solutionId; + + + @ApiModelProperty(value = "鏂规瀵硅薄", example = "1") + @TableField(exist = false) + private Solutions solution; + } -- Gitblit v1.9.3