解决合并冲突
authordxy <1731678236@qq.com>
Tue, 26 Mar 2024 11:45:19 +0000 (19:45 +0800)
committerdxy <1731678236@qq.com>
Tue, 26 Mar 2024 11:45:19 +0000 (19:45 +0800)
commit67e017fb3e3978c585c84642108cf8d61875181d
treeadd828b095a381018cb98f9f7c616feb259ed09b
parente6bb5e20fda3362b2b5ec176141aad41d4de0842
解决合并冲突
code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
code/sdk/application/wearable/service/ble_service/bleEvent.c
code/sdk/application/wearable/service/ble_service/bleService.c
code/sdk/application/wearable/service/ble_service/bleService.h