From dd4cd96c69061da3ff80cbfb87237b16cda8abc3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 26 九月 2025 18:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
index 787c4d4..81c6b49 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
@@ -1,14 +1,14 @@
package com.doumee.dao.business.model;
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 com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
/**
@@ -62,4 +62,7 @@
@ExcelColumn(name="绫诲瀷")
private Integer type;
+ @ApiModelProperty(value = "绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 ", example = "1")
+ @ExcelColumn(name="绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 ")
+ private Integer constructionType;
}
--
Gitblit v1.9.3