From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttWmstBase.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttWmstBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttWmstBase.java
index c530271..c3328ba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttWmstBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttWmstBase.java
@@ -23,10 +23,10 @@
/**
* 主键
*/
- @JsonSerialize(using = ToStringSerializer.class)
+// @JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
@TableField("\"guid\"")
- @TableId("\"guid\"")
+// @TableId("\"guid\"")
private String guid;
/**
@@ -55,14 +55,14 @@
*/
@ApiModelProperty(value = "在线状态（0离线，1在线）")
@TableField("\"online\"")
- private String online;
+ private Integer online;
/**
* 在线状态（1海康老平台，2海康楚天云平台）
*/
@ApiModelProperty(value = "来源")
@TableField("\"sys_resource\"")
- private String sysResource;
+ private Integer sysResource;
/**
* 建站时间
--
Gitblit v1.9.3