Merge branch 'master' of https://gitee.com/xiandafu/springboot-plus

admin-console/src/main/resources/META-INF/myenv.properties

-dbIp=jdbc:oracle:thin:@172.16.86.56:1521:dfzb
\ No newline at end of file

admin-core/src/main/resources/META-INF/spring-devtools.properties

-restart.include.beetl=/beetl-2.7.12.jar
-restart.include.beetlsql=/beetlsql-2.8.5.jar
\ No newline at end of file

pom.xml

@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.ibeetl</groupId>
             <artifactId>beetl-framework-starter</artifactId>
-            <version>1.1.37.RELEASE</version>
+            <version>1.1.38.RELEASE</version>
         </dependency>
         <dependency>
 		  <groupId>com.trigersoft</groupId>