Merge remote-tracking branch 'remotes/origin/main' into v1.2.0

sean.zhou

2022-09-23 8ce3bb68bdc2250cc4a8a3d29085443fac64615a

 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);

}