Merge remote-tracking branch 'origin/master' into master

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

 src/main/webapp/WEB-INF/config-mybatis.xml

@@ -15,7 +15,7 @@
      <setting name="useGeneratedKeys" value="false"/>
      <setting name="defaultExecutorType" value="SIMPLE"/>
      <setting name="defaultStatementTimeout" value="25000"/>
      <setting name="logImpl" value="LOG4J" />
      <setting name="logImpl" value="STDOUT_LOGGING" />
   </settings>

   <typeHandlers>