From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java
index 2e9eea1..586f7e9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.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 com.doumee.core.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;

--
Gitblit v1.9.3