pom冲突解决

svr/svr-healthy-house/pom.xml

@@ -30,6 +30,12 @@
		<dependency>
			<groupId>org.springframework.cloud</groupId>
			<artifactId>spring-cloud-starter</artifactId>
			<exclusions>
				<exclusion>
					<artifactId>bcprov-jdk15on</artifactId>
					<groupId>org.bouncycastle</groupId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
@@ -82,6 +88,34 @@
					<artifactId>jackson-coreutils</artifactId>
					<groupId>com.github.fge</groupId>
				</exclusion>
				<exclusion>
					<artifactId>jsr305</artifactId>
					<groupId>com.google.code.findbugs</groupId>
				</exclusion>
				<exclusion>
					<artifactId>commons-logging</artifactId>
					<groupId>commons-logging</groupId>
				</exclusion>
				<exclusion>
					<artifactId>swagger-compat-spec-parser</artifactId>
					<groupId>io.swagger</groupId>
				</exclusion>
				<exclusion>
					<artifactId>swagger-models</artifactId>
					<groupId>io.swagger</groupId>
				</exclusion>
				<exclusion>
					<artifactId>vavr</artifactId>
					<groupId>io.vavr</groupId>
				</exclusion>
				<exclusion>
					<artifactId>commons-lang3</artifactId>
					<groupId>org.apache.commons</groupId>
				</exclusion>
				<exclusion>
					<artifactId>asm</artifactId>
					<groupId>org.ow2.asm</groupId>
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
@@ -179,6 +213,12 @@
		<dependency>
			<groupId>net.sf.json-lib</groupId>
			<artifactId>json-lib</artifactId>
			<exclusions>
				<exclusion>
					<artifactId>commons-lang</artifactId>
					<groupId>commons-lang</groupId>
				</exclusion>
			</exclusions>
		</dependency>
        <!-- 文件服务器 -->
        <dependency>

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/facility/FacilityService.java

@@ -195,7 +195,7 @@ public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
            facility.setServiceEndTime(facilityMsg.getServiceEndTime());
            facility.setLongitude(longitude);
            facility.setLatitude(latitude);
            facility.setDeleteFlag("0");
            if (isHasFacility(longitude, latitude)) {
                errors.add(facility);
            } else {