Merge branch 'dev_20230222_live' into master_saas

mec-biz/pom.xml

@@ -58,5 +58,11 @@
 			<version>1.0.0</version>
 		</dependency>
 
+		<!--修复依赖冲突-->
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib</artifactId>
+		</dependency>
+
     </dependencies>
 </project>

pom.xml

@@ -229,6 +229,13 @@
 				<version>1.2.2</version>
 			</dependency>
 
+			<!--修复依赖冲突-->
+			<dependency>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-stdlib</artifactId>
+				<version>1.3.70</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>