Merge remote-tracking branch 'origin/dev' into qa

cjl

2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07

 screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java

@@ -20,4 +20,6 @@
    List<SysDictData> listAll(String code, String dataKey);

    SysDictData listOne(String code, String dataKey);

    List<SysDictData> listWindAll(String code, List<String> dataKey);
}