Merge remote-tracking branch 'origin/main'

guoshilong

2023-09-23 435c3e59682795fddaa9663e2f1e8401b90896e9

 src/main/java/com/dji/sample/manage/service/IDeviceDictionaryService.java

@@ -13,10 +13,12 @@

    /**
     * Query the type data of the device based on domain, device type and sub type.
     *
     * @param domain
     * @param deviceType
     * @param subType
     * @return
     */
    Optional<DeviceDictionaryDTO> getOneDictionaryInfoByTypeSubType(Integer deviceType, Integer subType);
    Optional<DeviceDictionaryDTO> getOneDictionaryInfoByTypeSubType(Integer domain, Integer deviceType, Integer subType);

}