Authored by mali

Merge branch 'master' into gray

@@ -5,6 +5,5 @@ @@ -5,6 +5,5 @@
5 <configuration> 5 <configuration>
6 <settings> 6 <settings>
7 <setting name="defaultStatementTimeout" value="10"/> <!-- seconds --> 7 <setting name="defaultStatementTimeout" value="10"/> <!-- seconds -->
8 - <setting name="logImpl" value="STDOUT_LOGGING" /> <!-- 在控制台打印sql语句 -->  
9 </settings> 8 </settings>
10 </configuration> 9 </configuration>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <properties> 18 <properties>
19 <qiniu.version>7.0.5</qiniu.version> 19 <qiniu.version>7.0.5</qiniu.version>
20 <project-name>yohoufo-fore</project-name> 20 <project-name>yohoufo-fore</project-name>
21 - <model.version>21.0-SNAPSHOT</model.version> 21 + <model.version>20.0-SNAPSHOT</model.version>
22 <lombok.version>1.16.16</lombok.version> 22 <lombok.version>1.16.16</lombok.version>
23 </properties> 23 </properties>
24 24