From e7180a965206be1d4ca141dd68b41f50233478e2 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 21 一月 2026 11:34:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-server/src/main/java/com/estate/expert/admin/domain/business/screenaccount/ScreenAccount.java | 76 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/domain/business/screenaccount/ScreenAccount.java b/admin-server/src/main/java/com/estate/expert/admin/domain/business/screenaccount/ScreenAccount.java
index 1079b79..4b89deb 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/domain/business/screenaccount/ScreenAccount.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/domain/business/screenaccount/ScreenAccount.java
@@ -1,35 +1,71 @@
package com.estate.expert.admin.domain.business.screenaccount;
-import com.estate.expert.admin.domain.common.EntityBase;
-import com.estate.expert.admin.domain.user.User;
-import lombok.Getter;
-import lombok.Setter;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
- * 大屏账号
- **/
-@Getter
-@Setter
-@Entity
-@Table(name = "screen_account")
-public class ScreenAccount extends EntityBase {
+ * <p>
+ * 在岗情况
+ * </p>
+ *
+ * @author l
+ * @since 2026-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("screen_account")
+@ApiModel(value="ScreenAccount对象", description="大屏账号")
+public class ScreenAccount implements Serializable {
- @Column(nullable = false)
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "1委托方 2项目")
+ @TableField("type")
private Integer type;
- @Column(nullable = false)
+ @ApiModelProperty(value = "1启用 2关闭")
+ @TableField("state")
private Integer state;
- @Column(name = "client_project_ids")
- private String clientProjectIds;
+ @ApiModelProperty(value = "false正常true删除")
+ @TableField("deleted")
+ private Boolean deleted;
- @Column(unique = true, nullable = false)
+ @ApiModelProperty(value = "创建时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "账号")
+ @TableField("account")
private String account;
- @Column(nullable = false)
+ @ApiModelProperty(value = "密码")
+ @TableField("password")
private String password;
+
+ @ApiModelProperty(value = "项目/委托方id")
+ @TableField("client_project_ids")
+ private String clientProjectIds;
+
+ @ApiModelProperty(value = "图片")
+ @TableField("update_time")
+ private LocalDateTime updateTime;
+
+
}
--
Gitblit v1.7.1