From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
index 07d5852..1bfa566 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.java
@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.admin.request.OptionsObject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,6 +12,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 璇曢淇℃伅琛�
@@ -29,6 +32,11 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @ExcelColumn(name="鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String creatorName;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
@@ -80,4 +88,7 @@
@ExcelColumn(name="浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�")
private Integer useType;
+ @ApiModelProperty(value = "閫夐」闆嗗璞￠泦鍚�")
+ @TableField(exist = false)
+ private List<OptionsObject> objectList;
}
--
Gitblit v1.9.3