Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-jmreport into dev

pom.xml

@@ -70,12 +70,12 @@
         </dependency>
 
         <!-- minio oss-->
-        <dependency>
+        <!--<dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
             <version>${minio.version}</version>
             <optional>true</optional>
-        </dependency>
+        </dependency>-->
 
         <!-- ============================数据库驱动========================== -->
         <!--mysql-->
@@ -85,14 +85,15 @@
             <version>${mysql-connector-java.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <!-- oracle驱动-->
+        <!-- ===需要什么数据库，手工打开注释=== -->
+        <!-- oracle驱动
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>11.2.0.3</version>
             <scope>runtime</scope>
-        </dependency>
+        </dependency>-->
-        <!-- ===需要什么数据库，手工打开注释=== -->
+
         <!--  sqlserver
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>