Merge branch 'test-module-zhouyin' into test-module

# Conflicts:
#	jl-rtss-simulation/NCC/pom.xml
#	jl-rtss-simulation/ncc/pom.xml
#	jl-rtss-simulation/pom.xml

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "ecs"]
 	path = ecs
 	url = https://git.code.tencent.com/joylink-common/ecs.git
-[submodule "jl-rtss-simulation/ncc/ncc-message"]
-	path = jl-rtss-simulation/ncc/ncc-message
+[submodule "jl-rtss-simulation/NCC/ncc-message"]
+	path = jl-rtss-simulation/NCC/ncc-message
 	url = https://git.code.tencent.com/lian-cbtc/NCC/ncc-message.git

jl-rtss-manage/pom.xml

@@ -26,7 +26,7 @@
 		</dependency>
 		<dependency>
 			<groupId>club.joylink.rtss</groupId>
-			<artifactId>ncc</artifactId>
+			<artifactId>NCC</artifactId>
 			<version>0.1</version>
 		</dependency>
 

jl-rtss-simulation/NCC/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
 <!--    <groupId>club.joylink.rtss.simulation</groupId>-->
-    <artifactId>ncc</artifactId>
+    <artifactId>NCC</artifactId>
     <packaging>jar</packaging>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>club.joylink.rtss</groupId>
-            <artifactId>ncc-message</artifactId>
+            <artifactId>simulation-message</artifactId>
             <version>0.1</version>
         </dependency>
     </dependencies>

jl-rtss-simulation/ncc/src/main/resources/application-simulation-ncc.yml

@@ -1,6 +0,0 @@
-
-mybatis-plus:
-  type-aliases-package: club.joylink.rtss.auth.mapper
-  mapper-locations: classpath:mapper/ncc/*.xml
-  configuration:
-    map-underscore-to-camel-case: true

jl-rtss-simulation/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<modules>
 		<module>ISCS</module>
-        <module>ncc</module>
+        <module>NCC</module>
         <module>simulation-message</module>
     </modules>
 	<parent>