From 09be07fdaa8ed24fc7242fbf311d25e1e0f9c6d9 Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Mon, 9 Sep 2024 16:28:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:()=20=E4=BC=98=E5=8C=96=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/common/domain/data/base/BaseQuery.java    |  2 ++
 .../java/com/muyu/server/mysql/MySqlQuery.java     | 14 ++++----------
 .../com/muyu/server/service/DataLinkService.java   |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cloud-property-common/src/main/java/com/muyu/common/domain/data/base/BaseQuery.java b/cloud-property-common/src/main/java/com/muyu/common/domain/data/base/BaseQuery.java
index 4cd9b5f..2bb884a 100644
--- a/cloud-property-common/src/main/java/com/muyu/common/domain/data/base/BaseQuery.java
+++ b/cloud-property-common/src/main/java/com/muyu/common/domain/data/base/BaseQuery.java
@@ -18,5 +18,7 @@ import lombok.experimental.SuperBuilder;
 @NoArgsConstructor
 public class BaseQuery
 {
+    private String databaseName;
 
+    private String dataSourceId;
 }
diff --git a/cloud-property-server/src/main/java/com/muyu/server/mysql/MySqlQuery.java b/cloud-property-server/src/main/java/com/muyu/server/mysql/MySqlQuery.java
index 798d47f..b0b7c52 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/mysql/MySqlQuery.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/mysql/MySqlQuery.java
@@ -1,8 +1,7 @@
 package com.muyu.server.mysql;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import com.muyu.common.domain.data.base.BaseQuery;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import java.util.Map;
@@ -14,20 +13,15 @@ import java.util.Map;
  * @name：MysqlQuery
  * @Date：2024/8/29 16:06
  */
-
+@EqualsAndHashCode(callSuper = true)
 @Data
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MySqlQuery
+public class MySqlQuery extends BaseQuery
 {
-
-    private String dataSourceId;
-
     private String tableName;
 
-    private String databaseName;
-
     private String sql;
     private Long one;
     private Integer two;
diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/DataLinkService.java b/cloud-property-server/src/main/java/com/muyu/server/service/DataLinkService.java
index 973c30e..85e0551 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/service/DataLinkService.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/service/DataLinkService.java
@@ -30,7 +30,7 @@ public interface DataLinkService {
     /**
      * 查询表数据dashuju表
      *
-     * @param dataName 数据库名称
+     * @param databaseName 数据库名称
      * @param sql      sql语句
      * @param one
      * @param two