Merge branch 'master' of http://gitlab.coralcodes.com:30000/shil0009/cihai

serverside/cihai-core/src/main/java/com/dookay/cihai/core/CihaiCoreApplication.java

 package com.dookay.cihai.core;
 package com.dookay.cihai.core;
 
 
 import com.dookay.coral.common.core.CoralCommonCoreMarker;
 import com.dookay.coral.common.core.CoralCommonCoreMarker;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 
-
 /**
 /**
- * 项目运行入口
- *
  * @author houkun
  * @author houkun
  */
  */
-@SpringBootApplication(
-        // 加载不同模块的配置与待注入的Bean
-        scanBasePackageClasses = {
-                CoralCommonCoreMarker.class,
-                CihaiCoreApplication.class
-        })
-@MapperScan(basePackageClasses = CihaiCoreApplication.class)
-public class CihaiCoreApplication {
+@SpringBootApplication(scanBasePackageClasses = {
+        CoralCommonCoreMarker.class,
+        CiHaiCoreApplication.class
+})
+
+public class CiHaiCoreApplication {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
-        SpringApplication.run(CihaiCoreApplication.class, args);
+        SpringApplication.run(CiHaiCoreApplication.class, args);
     }
     }
 }
 }

serverside/cihai-core/src/test/java/com/dookay/cihai/core/CihaiCoreApplicationTests.java

@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @Rollback
 @Rollback
 @Transactional
 @Transactional
-@Import(CihaiCoreApplication.class)
+@Import(CiHaiCoreApplication.class)
 public class CihaiCoreApplicationTests {
 public class CihaiCoreApplicationTests {
 
 
 	@Test
 	@Test