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

yifu-common/yifu-common-ekp/pom.xml

@@ -15,5 +15,9 @@
 	<description>yifu EKP 工具类</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot</artifactId>
+		</dependency>
 	</dependencies>
 </project>

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpSalaryUtil.java

 package com.yifu.cloud.plus.v1.yifu.ekp.util;
 
-import com.yifu.cloud.plus.v1.yifu.common.ekp.config.EkpSalaryProperties;
+import com.yifu.cloud.plus.v1.yifu.ekp.config.EkpSalaryProperties;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;