Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -311,9 +311,9 @@ public class SysDictionaryController extends CoreBaseController{
         }
     }
 
-    @GetMapping("/find-soft-type")
+    @GetMapping("/find-soft-type/{id}")
     @ApiOperation(value = "根据模块查询顶级字典",notes = "根据模块查询顶级字典")
-    public ResultBean findSysDictionaryByTopBySoftType(Integer softType){
+    public ResultBean findSysDictionaryByTopBySoftType(@PathVariable("id")Integer softType){
         try {
             List<SysDictionary> dictionaryList = sysDictionaryService.findSysDictionaryByTopBySoftType(softType);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictionaryList);