From 34f587564c9a34515e7deda4dcd02eb748480e1f Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 13 一月 2025 18:05:24 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java index 96c2bc7..98054d3 100644 --- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java +++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java @@ -3,13 +3,12 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.doumee.core.constants.OperaType; -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 lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; @@ -99,8 +98,8 @@ @ApiModelProperty(value = "寰俊openid鎺ㄩ�佹捣搴锋椂闂�", example = "1", hidden = true) private Date openidHkDate; - //2024骞�12鏈�6鏃�11:00:30 绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 - @ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1璁垮", example = "0") + //2024骞�12鏈�6鏃�11:00:30 绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 3tms绠℃帶浜哄憳 + @ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳 3tms绠℃帶浜哄憳", example = "0") private Integer type; @ApiModelProperty(value = "寰俊鏄电О") -- Gitblit v1.9.3