From 8ce3bb68bdc2250cc4a8a3d29085443fac64615a Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/main' into v1.2.0

---
 src/main/java/com/dji/sample/manage/service/IDeviceDictionaryService.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dji/sample/manage/service/IDeviceDictionaryService.java b/src/main/java/com/dji/sample/manage/service/IDeviceDictionaryService.java
index 65324ac..201f82c 100644
--- a/src/main/java/com/dji/sample/manage/service/IDeviceDictionaryService.java
+++ b/src/main/java/com/dji/sample/manage/service/IDeviceDictionaryService.java
@@ -13,12 +13,10 @@
 
     /**
      * Query the type data of the device based on domain, device type and sub type.
-     * @param domain
      * @param deviceType
      * @param subType
      * @return
      */
-    Optional<DeviceDictionaryDTO> getOneDictionaryInfoByDomainTypeSubType(
-            Integer domain, Integer deviceType, Integer subType);
+    Optional<DeviceDictionaryDTO> getOneDictionaryInfoByTypeSubType(Integer deviceType, Integer subType);
 
 }

--
Gitblit v1.9.3