From 5a31b2ea65bc435ae8a57f5a692fc71685e990ad Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期四, 12 五月 2022 10:51:29 +0800
Subject: [PATCH] 提交代码
---
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java
index e3ab457..47c6461 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SgNvrVo.java
@@ -2,6 +2,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.Dict;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import io.swagger.annotations.ApiModel;
@@ -46,6 +47,7 @@
*/
@ExcelProperty(value = "閫氶亾")
@ApiModelProperty("閫氶亾")
+ @Dict(dicCode = "DICT109")
private String passageway;
/**
@@ -95,6 +97,7 @@
*/
@ExcelProperty(value = "寤虹瓚鍗曞厓")
@ApiModelProperty("寤虹瓚鍗曞厓")
+ @Dict(dictTable = "bs_building", dicCode = "id", dicText = "detailed_name")
private Long buildingId;
/**
@@ -102,6 +105,7 @@
*/
@ExcelProperty(value = "鎵�灞炴満鏋�")
@ApiModelProperty("鎵�灞炴満鏋�")
+ @Dict(dictTable = "bs_organization", dicCode = "id", dicText = "detailed_name")
private Long organizationId;
/**
@@ -109,6 +113,7 @@
*/
@ExcelProperty(value = "鏂藉伐鎵规")
@ApiModelProperty("鏂藉伐鎵规")
+ @Dict(dictTable = "sg_construction_batch", dicCode = "id", dicText = "batch")
private Long constructionBatchId;
/**
@@ -130,6 +135,7 @@
*/
@ExcelProperty(value = "鐢熶骇鍘傚晢")
@ApiModelProperty("鐢熶骇鍘傚晢")
+ @Dict(dictTable = "dev_manufacturer", dicCode = "id", dicText = "name")
private Long manufacturerId;
/**
--
Gitblit v1.9.1