Merge branch 'sprint/s4' into release/s4

demo-athenaopt_backend/develop/conf/log4j2.xml

@@ -61,7 +61,7 @@
 	</Appenders>
 	<Loggers>		
 		<!--<Root level="@logLevel@">-->
-		<Root level="ERROR">
+		<Root level="@logLevel@">
 			<!-- 3.引入使用 -->
 			<appender-ref ref="ASYNC-dwAppender"/>
 

demo-athenaopt_backend/pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.digiwin.lcdp</groupId>
             <artifactId>lcdp-modeldriven</artifactId>
-            <version>1.0.1.17</version>
+            <version>1.0.1.32</version>
         </dependency>
 
         <dependency>