| .. | 
		
		
			
				
					| HikariCP-3.4.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| accessors-smart-1.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| amqp-client-5.7.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| android-json-0.0.20131108.vaadin1.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| apiguardian-api-1.1.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| asm-5.0.4.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| assertj-core-3.13.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| bson-3.11.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| byte-buddy-1.10.8.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| byte-buddy-agent-1.10.8.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| classmate-1.5.1.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| commons-lang3-3.9.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| commons-pool2-2.7.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| druid-1.1.23.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| druid-spring-boot-starter-1.1.23.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| fastjson-1.2.41.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| groovy-2.5.10.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| gson-2.8.6.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| hamcrest-2.1.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| hibernate-validator-6.0.18.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| hutool-all-5.5.4.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jackson-annotations-2.10.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jackson-core-2.10.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jackson-databind-2.10.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jackson-datatype-jdk8-2.10.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jackson-datatype-jsr310-2.10.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jackson-module-parameter-names-2.10.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jakarta.activation-api-1.2.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jakarta.annotation-api-1.3.5.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jakarta.validation-api-2.0.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jakarta.xml.bind-api-2.3.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jboss-logging-3.4.1.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| json-path-2.4.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| json-smart-2.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jsonassert-1.5.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| jul-to-slf4j-1.7.30.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-4.12.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-jupiter-5.5.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-jupiter-api-5.5.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-jupiter-engine-5.5.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-jupiter-params-5.5.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-platform-commons-1.5.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-platform-engine-1.5.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| junit-vintage-engine-5.5.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| lettuce-core-5.2.2.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| log4j-api-2.12.1.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| log4j-to-slf4j-2.12.1.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| logback-classic-1.2.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| logback-core-1.2.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| lombok-1.18.12.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| meter-reading-common-1.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mockito-core-3.1.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mockito-junit-jupiter-3.1.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mongodb-driver-3.11.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mongodb-driver-core-3.11.2.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mybatis-3.5.5.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mybatis-spring-2.0.5.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mybatis-spring-boot-autoconfigure-2.1.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mybatis-spring-boot-starter-2.1.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| mysql-connector-java-8.0.19.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| netty-all-4.1.48.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| netty-buffer-4.1.48.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| netty-codec-4.1.48.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| netty-common-4.1.48.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| netty-handler-4.1.48.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| netty-resolver-4.1.48.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| netty-transport-4.1.48.Final.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| objenesis-2.6.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| opentest4j-1.2.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| reactive-streams-1.0.3.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| reactor-core-3.3.4.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| slf4j-api-1.7.30.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| snakeyaml-1.25.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-amqp-2.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-aop-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-beans-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-autoconfigure-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-amqp-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-data-mongodb-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-data-redis-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-jdbc-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-json-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-logging-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-test-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-tomcat-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-validation-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-starter-web-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-test-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-boot-test-autoconfigure-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-context-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-context-support-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-core-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-data-commons-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-data-keyvalue-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-data-mongodb-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-data-redis-2.2.6.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-expression-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-jcl-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-jdbc-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-messaging-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-oxm-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-rabbit-2.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-retry-1.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-test-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-tx-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-web-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| spring-webmvc-5.2.5.RELEASE.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| tomcat-embed-core-9.0.33.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| tomcat-embed-el-9.0.33.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| tomcat-embed-websocket-9.0.33.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| xmlunit-core-2.6.4.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago | 
		
			
				
					| xxl-job-core-2.2.0.jar | d16aa8a7db
					Merge branch '20200908' of C:\Users\86159\git_repos\water-iot with conflicts. | 4 years ago |