diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..82eca33
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
\ No newline at end of file
diff --git a/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java b/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java
index 68447a3..0a86c8e 100644
--- a/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java
+++ b/src/main/java/com/gzzn/omms/adminapi/AdminApiApplication.java
@@ -2,7 +2,6 @@ package com.gzzn.omms.adminapi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 public class AdminApiApplication {
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 0ac2508..2e140bf 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,37 +1,34 @@
-package com.gzzn.omms.adminapi.controller.basicdata;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.IABCDao;
-import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.ICheckinGroupDao;
-import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.ABC;
-import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.CheckinGroup;
-import com.gzzn.omms.adminapi.dto.ResponseDto;
-
-/**
- *  值机岛
- * @author zhouxiunai
- *
- */
-@RestController
-public class CheckinGroupController {
-
-	@Autowired
-	private ICheckinGroupDao checkinGroupDao;
-	
-	@Autowired
-	private IABCDao ABCDao;
-	
-	@GetMapping(value="/basicdata/checkinGroup")
-	public ResponseDto getCheckinGroup() {
-		
-		ABC abc = ABCDao.findOne("1");
-		
-		return ResponseDto.success(abc);
-	}
-	
-	
-	
-}
+package com.gzzn.omms.adminapi.controller.basicdata;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
+
+/**
+ *  值机岛
+ * @author zhouxiunai
+ *
+ */
+@RestController
+public class CheckinGroupController {
+
+	
+	@Autowired
+	private ICheckinGroupDao checkinGroupDao;
+	
+	/**
+	 * 获取所有值机岛数据
+	 * @return
+	 */
+	@GetMapping(value="/basicdata/checkinGroups")
+	public ResponseDto getCheckinGroup() {
+		List<CheckinGroup> ls = (List<CheckinGroup>) checkinGroupDao.findAll();
+		return ResponseDto.success(ls);
+	}
+}
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/BaseEntity.java b/src/main/java/com/gzzn/omms/adminapi/domain/BaseEntity.java
deleted file mode 100644
index bc0b954..0000000
--- a/src/main/java/com/gzzn/omms/adminapi/domain/BaseEntity.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.gzzn.omms.adminapi.domain;
-
-public interface BaseEntity {
-  public void load();
-  public void save();
-}
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/IABCDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/IABCDao.java
deleted file mode 100644
index f0e7c16..0000000
--- a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/IABCDao.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.gzzn.omms.adminapi.domain.secondary.dao.basicdata;
-
-import org.springframework.data.repository.CrudRepository;
-
-import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.ABC;
-
-public interface IABCDao  extends CrudRepository<ABC,String>{
-
-}
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/ICheckinGroupDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/ICheckinGroupDao.java
index db956c2..1438a01 100644
--- a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/ICheckinGroupDao.java
+++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/ICheckinGroupDao.java
@@ -1,10 +1,9 @@
-package com.gzzn.omms.adminapi.domain.secondary.dao.basicdata;
-
-import org.springframework.data.repository.CrudRepository;
-
-import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.CheckinGroup;
-
-public interface ICheckinGroupDao extends CrudRepository<CheckinGroup,String> {
-   
-	public CheckinGroup findByCheckinGroupCode(String code);
-}
+package com.gzzn.omms.adminapi.domain.secondary.dao.basicdata;
+
+import org.springframework.data.repository.CrudRepository;
+
+import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.CheckinGroup;
+
+public interface ICheckinGroupDao extends CrudRepository<CheckinGroup,String> {
+   
+}
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/ABC.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/ABC.java
deleted file mode 100644
index 215479a..0000000
--- a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/ABC.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="ABC")
-public class ABC {
-	
- 
-
-@Id
- @Column(name = "ID")	
- private String id;
- 
- @Column(name = "NAME")	
- private String name;
- 
- 
- public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
- 
-}
diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/CheckinGroup.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/CheckinGroup.java
index 657aa89..ec905b4 100644
--- a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/CheckinGroup.java
+++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/CheckinGroup.java
@@ -1,32 +1,46 @@
-package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.gzzn.omms.adminapi.domain.BaseEntity;
-import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.ICheckinGroupDao;
-
-
-
-/**
- * 值机岛
- * @author zhouxiunai
- *
- */
-@Entity
-@Table(name="ORMS_CHECKIN_GROUP")
-public class CheckinGroup {
-	@Id
-	@Column(name = "CHECKIN_GROUP_CODE")
-	private String checkinGroupCode;
-	
-	
-
-	@Column(name = "CHECKIN_GROUP_NAME")
-	private String checkinGroupName;
-}
+package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+
+/**
+ * 值机岛
+ * @author zhouxiunai
+ *
+ */
+@Entity
+@Table(name="ORMS_CHECKIN_GROUP")
+public class CheckinGroup {
+
+	@Id
+	@Column(name = "CHECKIN_GROUP_CODE")
+	private String checkinGroupCode;
+	
+	
+
+	@Column(name = "CHECKIN_GROUP_NAME")
+	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/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 903b69f..b2ee199 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -9,7 +9,7 @@ spring:
         test-on-borrow: true
         initial-size: 3
         
-    third:
+    secondary:
       username: ommsxc
       password: ommsxc
       url: jdbc:oracle:thin:@130.120.2.105:1521/orcl
@@ -17,15 +17,4 @@ spring:
       tomcat:
         max-active: 30
         test-on-borrow: true
-        initial-size: 3
-   
-    secondary:
-      username: dc0305
-      password: 123456
-      url: jdbc:oracle:thin:@130.120.2.219:1521/orcl
-      driver: oracle.jdbc.driver.OracleDriver
-      tomcat:
-        max-active: 30
-        test-on-borrow: true
-        initial-size: 3
-      
\ No newline at end of file
+        initial-size: 3
\ No newline at end of file