Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of…

Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	pom.xml

pom.xml

@@ -113,7 +113,7 @@
             <dependency>
                 <groupId>com.freemud.application.service.sdk</groupId>
                 <artifactId>sdk-common-base</artifactId>
-                <version>2.3.1.BETA</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
             <!--              mybatis            -->