From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
index dcb7980..09c04f0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerParam.java
@@ -87,9 +87,10 @@
@ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
private Integer companyId;
+
@ApiModelProperty(value = "璐ｄ换閮ㄩ棬缂栫爜", example = "1")
// @ExcelColumn(name="鎻愭姤浜虹紪鐮侊紙鍏宠仈member锛�")
@TableField(exist = false)
- private Integer companyName;
+ private String companyName;
}
--
Gitblit v1.9.3