Merge branch '84-integrate' into 'develop'

fix：修复方法相同问题







See merge request !68

smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/keyclaok/KeycloakDepartmentController.java

@@ -119,7 +119,7 @@ public class KeycloakDepartmentController {
      * @return 部门设备列表
      */
     @SysLogIgnore
-    @GetMapping("/tenant/department/device/list")
+    @GetMapping("/tenant/department/device/simpleList")
     public Response listDepartmentDeviceSimple(DeviceDepartmentCmd departmentCmd){
         if(departmentCmd.getActivate() == null){departmentCmd.setActivate(true);}
         return SingleResponse.of(departmentService.listDepartmentDeviceSimple(departmentCmd));