Merge branch 'master' of http://101.36.160.140:21044/province-qinghai/transaction-service

# Conflicts:
#	transaction-server/pom.xml

transaction-server/pom.xml

@@ -116,12 +116,15 @@
 			<artifactId>druid</artifactId>
 			<version>1.0.28</version>
 		</dependency>
+<<<<<<< HEAD
 		<!--mysql数据库-->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>8.0.28</version>
 		</dependency>
+=======
+>>>>>>> ac66e39ab1e776a96e4d10888c56d2f458ccdd36
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>

transaction-server/src/main/resources/bootstrap-mysqldev.yml

@@ -3,7 +3,7 @@ server:
   tomcat:
     uri-encoding: utf-8
     max-http-post-size: -1
-    
+
 spring:
   jpa:
     open-in-view: true

transaction-server/transaction-server.iml

@@ -207,6 +207,8 @@
     <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
     <orderEntry type="library" name="Maven: com.gbase8s:ifxjdbc:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.gbase:druid:1.0.28" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.11.4" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />