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
..
main	Merge remote-tracking branch 'origin/v2.0.9_dev'	2021-11-01 14:41:05 +08:00
test/java/com/dispose/test	Merge remote-tracking branch 'origin/v2.0.9_dev'	2021-11-01 14:41:05 +08:00