Merge remote-tracking branch 'origin/master'

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceCategoryController.java

@@ -70,6 +70,13 @@ public class DeviceCategoryController {
         return Flux.fromIterable(statics);
     }
 
+    @GetMapping("/_query/no-paging")
+    @Operation(summary = "获取全部分类目录")
+    public Flux<DeviceCategory> getAllCategory2() {
+        return Flux.fromIterable(statics);
+    }
+
+
     @GetMapping("/_tree")
     @Operation(summary = "获取全部分类目录(树结构)")
     public Flux<DeviceCategory> getAllCategoryTree() {

jetlinks-standalone/pom.xml

@@ -55,6 +55,12 @@
     <dependencies>
 
         <dependency>
+            <groupId>org.hswebframework.web</groupId>
+            <artifactId>hsweb-system-dictionary</artifactId>
+            <version>${hsweb.framework.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
         </dependency>