Merge branch '84-wb' of http://pms.inspur.com/javaweb/smsb-customer-manager into 84-wb

smsb-customer-manager-app/src/main/java/com/inspur/customer/service/org/SmsbDepartmentServiceImpl.java

@@ -359,7 +359,7 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
                 DeviceDepartmentDto deviceDepartmentDto = new DeviceDepartmentDto();
                 BeanUtils.copyProperties(child , deviceDepartmentDto);
                 deviceDepartmentDto.setDevices(deviceService.ListDeviceBind(child.getPath() , activate));
-                deviceDepartmentDto.setDevices(chaildRecurrenceHandle(child.getChildren() , activate));
+                deviceDepartmentDto.setChildren(chaildRecurrenceHandle(child.getChildren() , activate));
                 childrenList.add(deviceDepartmentDto);
             });
         }