From 8b65a5c9e392f46eeea7cfda9647d59aee4ec81a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 二月 2025 11:40:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/model/Sites.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
index aeda14f..1a53674 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -105,6 +105,6 @@
@TableField(exist = false)
private String base64;
@ApiModelProperty(value = "鐢靛瓙鍥存爮缁忕含搴﹂泦鍚� jsonb")
- @TableField(exist = false)
+// @TableField(exist = false)
private String electronicFence;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index 30b29df..78d5dbc 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -81,6 +81,7 @@
insert.setIsdeleted(Constants.ZERO);
insert.setInfo(sites.getInfo());
insert.setName(sites.getName());
+ insert.setType(sites.getType());
insert.setCode(sites.getCode());
insert.setElectronicFence(sites.getElectronicFence());
insert.setStatus(Constants.ZERO);
--
Gitblit v1.9.3