From 6c12dd77bc481aeabec568bfed3dd68e81b80f8b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 08:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/CabinetDetailBean.java | 100 +------------------------------------------------
1 files changed, 3 insertions(+), 97 deletions(-)
diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/CabinetDetailBean.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/CabinetDetailBean.java
index a43b7f2..52187a7 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/CabinetDetailBean.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/CabinetDetailBean.java
@@ -5,7 +5,6 @@
import lombok.Data;
-@Data
public class CabinetDetailBean implements Serializable {
//璁惧缂栧彿
private String code;
@@ -29,101 +28,8 @@
private Integer unBindGridNum;
//鏌滄牸淇℃伅
- private List<CabinetGridInfoVOListBean> cabinetGridInfoVOList;
+ private List<ManageKeyCabinetBean> cabinetGridInfoVOList;
- @Data
- public static class CabinetGridInfoVOListBean implements Serializable {
- //缁戝畾鐘舵�� 0鏈粦瀹氾紱1宸茬粦瀹�
- private Integer bindStatus;
- //鏉垮彿
- private String boardCode;
- //杞︾墝鍙�
- private int carCode;
- //閫氶亾鍙�
- private String channelCode;
- //缂栫爜
- private String code;
- //涓婚敭
- private Integer id;
- //閽ュ寵缂栫爜
- private Integer keyId;
- //閽ュ寵鐘舵�� 0鏈粦瀹� 1鍦ㄤ綅 2鍊熷嚭 3缁翠慨淇濆吇
- private Integer keyStatus;
- //鏌滀綋杩愯鐘舵�� 0姝ｅ父 1鏁呴殰
- private Integer workingStatus;
-
- public Integer getBindStatus() {
- return bindStatus;
- }
-
- public void setBindStatus(Integer bindStatus) {
- this.bindStatus = bindStatus;
- }
-
- public String getBoardCode() {
- return boardCode;
- }
-
- public void setBoardCode(String boardCode) {
- this.boardCode = boardCode;
- }
-
- public int getCarCode() {
- return carCode;
- }
-
- public void setCarCode(int carCode) {
- this.carCode = carCode;
- }
-
- public String getChannelCode() {
- return channelCode;
- }
-
- public void setChannelCode(String channelCode) {
- this.channelCode = channelCode;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getKeyId() {
- return keyId;
- }
-
- public void setKeyId(Integer keyId) {
- this.keyId = keyId;
- }
-
- public Integer getKeyStatus() {
- return keyStatus;
- }
-
- public void setKeyStatus(Integer keyStatus) {
- this.keyStatus = keyStatus;
- }
-
- public Integer getWorkingStatus() {
- return workingStatus;
- }
-
- public void setWorkingStatus(Integer workingStatus) {
- this.workingStatus = workingStatus;
- }
- }
public String getCode() {
return code;
@@ -205,11 +111,11 @@
this.unBindGridNum = unBindGridNum;
}
- public List<CabinetGridInfoVOListBean> getCabinetGridInfoVOList() {
+ public List<ManageKeyCabinetBean> getCabinetGridInfoVOList() {
return cabinetGridInfoVOList;
}
- public void setCabinetGridInfoVOList(List<CabinetGridInfoVOListBean> cabinetGridInfoVOList) {
+ public void setCabinetGridInfoVOList(List<ManageKeyCabinetBean> cabinetGridInfoVOList) {
this.cabinetGridInfoVOList = cabinetGridInfoVOList;
}
}
--
Gitblit v1.9.3