From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWellJson.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWellJson.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWellJson.java
index f36d151..acba61a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWellJson.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWellJson.java
@@ -19,7 +19,7 @@
{
private static final long serialVersionUID = 1L;
- List<TreeSelectWell> wellList;
+ List<TreeDeptWell> wellList;
int count0;
int count1;
int count2;
--
Gitblit v1.9.3