分支冲突测试

src/main/java/com/diagbot/web/KlDictionaryConller.java

@@ -27,11 +27,12 @@ public class KlDictionaryConller {
     @Autowired
     KlDictionaryInfoFacade dictionaryFacade;
 
-    @ApiOperation(value = "根据分组获取字典表信息详情[by:wangfeng]")
+    @ApiOperation(value = "根据分组1获取字典表信息详情[by:wangfeng]")
     @PostMapping("/getDictionaryInfo")
     @SysLogger("getDictionaryInfo")
     public RespDTO<Map<Long, List<DictionaryInfoDTO>>> getDictionaryInfoAll() {
 
+
         return RespDTO.onSuc(dictionaryFacade.getListBack());
     }
 }