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