Merge branch 'release/S3' of http://47.102.102.152/athena-demo/athena-opt-demo into hotfix

demo-athenaopt_backend/develop/conf/log4j2.xml

@@ -50,20 +50,20 @@
     	</Async-->
 
 		<!-- 1.引入appender -->
-	<!--	<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="https://lmc-hw-test.digiwincloud.com.cn">
+		<DwLog4j2Appender name="dwAppender" app="demo-athenaopt" endpoint="@lmcUrl@">
 			<PatternLayout pattern="${LOG_PATTERN}"/>
 		</DwLog4j2Appender>
-		&lt;!&ndash; 2.引入异步节点 &ndash;&gt;
+		<!-- 2.引入异步节点 -->
 		<Async name="ASYNC-dwAppender">
 			<AppenderRef ref="dwAppender"/>
-		</Async>-->
+		</Async>
 
 	</Appenders>
 	<Loggers>		
-		<Root level="@logLevel@">
-		<!--<Root level="ERROR">-->
+		<!--<Root level="@logLevel@">-->
+		<Root level="ERROR">
 			<!-- 3.引入使用 -->
-			<!--<appender-ref ref="ASYNC-dwAppender"/>-->
+			<appender-ref ref="ASYNC-dwAppender"/>
 
 			<appender-ref ref="consoleAppender" />
 			<appender-ref ref="rollingfileAppender" />

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/service/Impl/StaffServiceImpl.java

@@ -1,4 +1,4 @@
-package com.digiwin.athena.app.infra.service.impl;
+package com.digiwin.athena.app.infra.service.Impl;
 
 import com.digiwin.athena.app.infra.entity.StaffEntity;
 import com.digiwin.athena.app.infra.repository.StaffRepository;

demo-athenaopt_backend/pom.xml

@@ -57,11 +57,11 @@
         </dependency>
 
         <!--引入 lmc-sdk 依赖包-->
-        <!--<dependency>
+        <dependency>
             <groupId>com.digiwin.dap.middleware</groupId>
             <artifactId>lmc-sdk-log4j2</artifactId>
             <version>2.2.0.0</version>
-        </dependency>-->
+        </dependency>
 
         <dependency>
             <groupId>com.digiwin.lcdp</groupId>