From a92b97225a0676c3645b72d8945542f7db2e05ae Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 07 五月 2025 11:26:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlant.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlant.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlant.java
index 9e66f2e..338ac7c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlant.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlant.java
@@ -16,7 +16,7 @@
private static final long serialVersionUID = 1L;
/** id */
- private Long id;
+ private String id;
/** 宸ュ巶鍚嶇О */
@Excel(name = "宸ュ巶鍚嶇О")
@@ -30,12 +30,12 @@
@Excel(name = "鍚敤鐘舵��")
private String status;
- public void setId(Long id)
+ public void setId(String id)
{
this.id = id;
}
- public Long getId()
+ public String getId()
{
return id;
}
--
Gitblit v1.9.3