Merge branch 'v2' into v21
authorliangzhenying <867174124@qq.com>
Wed, 12 Mar 2025 02:57:31 +0000 (10:57 +0800)
committerliangzhenying <867174124@qq.com>
Wed, 12 Mar 2025 02:57:31 +0000 (10:57 +0800)
commitdd7c2f11917b7700313c2622b119935fa2f06b64
tree0ac5d3a595a9989744c0ce8888f307e06c5d1fe2
parent429d7139c5b125f3214667d8a134984f519e319d
parentb4be43f07b5b4120db72dc363395b55b3f2cf7fd
Merge branch 'v2' into v21

# Conflicts:
# IOTBluetooth/IOTBluetooth/IOTBluetooth.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate
# IOTBluetooth/IOTBluetooth/IOTBluetooth.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
# IOTBluetooth/IOTBluetooth/IOTBluetooth/IBAiManager.swift
# IOTBluetooth/IOTBluetooth/IOTBluetooth/IBluetooth.swift
IOTBluetooth/IOTBluetooth/IOTBluetooth.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate
IOTBluetooth/IOTBluetooth/IOTBluetooth/IBAiManager.swift
IOTBluetooth/IOTBluetooth/IOTBluetooth/IBReceiveManager.swift