Merge remote-tracking branch 'origin/master'

fill-manager/pom.xml

@@ -27,7 +27,7 @@
 				<profiles.active>develop</profiles.active>
 				<profiles.server.port>17215</profiles.server.port>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
+				<profiles.nacos.server-addr>192.168.0.239:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
@@ -203,7 +203,12 @@
 			<artifactId>pdfbox</artifactId>
 			<version>2.0.27</version>
 		</dependency>
-
+		<!-- 达梦数据库驱动-->
+		<dependency>
+			<groupId>com.dameng</groupId>
+			<artifactId>DmJdbcDriver18</artifactId>
+			<version>8.1.1.193</version>
+		</dependency>
 	</dependencies>