From 66ff6f509bbbba04cffc428e7e1c886b534b4f13 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
index 917cefd..38a5bfb 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
@@ -32,7 +32,7 @@
         if (!ObjectUtils.isEmpty(technologyName)){
             wrapper.like(Technology::getName, technologyName);
         }
-        wrapper.select(Technology::getId, Technology::getName, Technology::getDeviceGroup, Technology::getQuota);
+        wrapper.select(Technology::getId, Technology::getName, Technology::getDeviceGroup, Technology::getFather);
         return technologyMapper.selectMaps(wrapper);
     }
 }

--
Gitblit v1.9.3