HuangXin 7456a9947e Merge remote-tracking branch 'origin/v2.0.9_dev' ... # Conflicts: # config/application-dispose.properties # config/application-local.properties # pom.xml # src/main/java/com/cmhi/dispose/protocol/CmhiDisposeInterface.java # src/main/java/com/dispose/ability/impl/CmhiAbilityImpl.java # src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java # src/test/java/com/dispose/test/dev/debug/demo.java		2021-11-01 14:41:05 +08:00
..
application-dispose.properties	Merge remote-tracking branch 'origin/v2.0.9_dev'	2021-11-01 14:41:05 +08:00
application-local.properties	OCT	2021-10-28 16:10:22 +08:00
application-template.properties	OCT	2021-01-14 14:37:13 +08:00
application-test.properties	Merge remote-tracking branch 'origin/v2.0.9_dev'	2021-11-01 14:41:05 +08:00
application.properties	OCT	2021-01-13 18:25:25 +08:00
logback.xml	OCT	2021-10-28 09:22:03 +08:00
logback_debug.xml	OCT	2020-10-22 11:41:14 +08:00