Merge remote-tracking branch 'origin/master'

device-manager/pom.xml

@@ -148,6 +148,18 @@
 			</properties>
 		</profile>
 
+		<profile>
+			<id>qiling</id>
+			<properties>
+				<profiles.active>qiling</profiles.active>
+				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<package.environment>build:prod</package.environment>
+				<skipDeploy>true</skipDeploy>
+			</properties>
+		</profile>
+
 	</profiles>
 
 	<dependencies>
@@ -207,7 +219,12 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-
+		<!-- 达梦数据库驱动-->
+		<dependency>
+			<groupId>com.dameng</groupId>
+			<artifactId>DmJdbcDriver18</artifactId>
+			<version>8.1.1.193</version>
+		</dependency>
 	</dependencies>