diff --git a/pom.xml b/pom.xml
index c8987e0..991bc1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,12 @@
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.7.0</version>
+			<exclusions>
+		        <exclusion>
+		            <groupId>org.mapstruct</groupId>
+		            <artifactId>mapstruct</artifactId>
+		        </exclusion>
+	        </exclusions>
 		</dependency>
 		
 		<dependency> 
@@ -84,6 +90,11 @@
 		   <version>1.8.5</version>
 		</dependency>
 
+        <dependency>
+	        <groupId>org.mapstruct</groupId>
+	        <artifactId>mapstruct-jdk8</artifactId>
+	        <version>${org.mapstruct.version}</version>
+        </dependency>
 
 		<dependency>
 		    <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/CheckinGroupController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/CheckinGroupController.java
index 2e140bf..23803ad 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/CheckinGroupController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/CheckinGroupController.java
@@ -1,6 +1,7 @@
 package com.gzzn.omms.adminapi.controller.basicdata;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.RestController;
 import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.ICheckinGroupDao;
 import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.CheckinGroup;
 import com.gzzn.omms.adminapi.dto.ResponseDto;
+import com.gzzn.omms.adminapi.dto.basicdata.CheckinGroupDto;
+import com.gzzn.omms.adminapi.dto.basicdata.convert.ICheckinGroupConvert;
 
 /**
  *  值机岛
@@ -22,13 +25,25 @@ public class CheckinGroupController {
 	@Autowired
 	private ICheckinGroupDao checkinGroupDao;
 	
+	@Autowired
+	private ICheckinGroupConvert checkinGroupConvert;
+	
 	/**
 	 * 获取所有值机岛数据
 	 * @return
 	 */
 	@GetMapping(value="/basicdata/checkinGroups")
-	public ResponseDto getCheckinGroup() {
+	public ResponseDto<List<CheckinGroupDto>> getCheckinGroup() {
 		List<CheckinGroup> ls = (List<CheckinGroup>) checkinGroupDao.findAll();
-		return ResponseDto.success(ls);
+		
+		//转换dto
+		List<CheckinGroupDto> lsDto = ls.stream().map(x -> {
+			CheckinGroupDto dto = checkinGroupConvert.checkinGroupToCheckinGroupDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		
+		
+		return ResponseDto.success(lsDto);
 	}
 }
diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/CheckinGroupDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/CheckinGroupDto.java
new file mode 100644
index 0000000..9d4d08b
--- /dev/null
+++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/CheckinGroupDto.java
@@ -0,0 +1,25 @@
+package com.gzzn.omms.adminapi.dto.basicdata;
+
+public class CheckinGroupDto {
+	private String checkinGroupCode; //值机岛代码
+	private String checkinGroupName; //值机岛名称
+	
+	public String getCheckinGroupCode() {
+		return checkinGroupCode;
+	}
+
+
+	public void setCheckinGroupCode(String checkinGroupCode) {
+		this.checkinGroupCode = checkinGroupCode;
+	}
+
+
+	public String getCheckinGroupName() {
+		return checkinGroupName;
+	}
+
+
+	public void setCheckinGroupName(String checkinGroupName) {
+		this.checkinGroupName = checkinGroupName;
+	}
+}
diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/ICheckinGroupConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/ICheckinGroupConvert.java
new file mode 100644
index 0000000..9e98993
--- /dev/null
+++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/ICheckinGroupConvert.java
@@ -0,0 +1,12 @@
+package com.gzzn.omms.adminapi.dto.basicdata.convert;
+
+import org.mapstruct.Mapper;
+
+import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.CheckinGroup;
+import com.gzzn.omms.adminapi.dto.basicdata.CheckinGroupDto;
+
+@Mapper(componentModel="spring")
+public interface ICheckinGroupConvert {
+	
+   public CheckinGroupDto checkinGroupToCheckinGroupDto(CheckinGroup checkinGroup);
+}