From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 14:00:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java index 1209387..2896604 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java @@ -1,16 +1,15 @@ 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; -import java.math.BigDecimal; /** * 璁惧淇℃伅琛� -- Gitblit v1.9.3