Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
authork.liang <liangkang648253071@126.com>
Tue, 21 Dec 2021 03:09:22 +0000 (11:09 +0800)
committerk.liang <liangkang648253071@126.com>
Tue, 21 Dec 2021 03:09:22 +0000 (11:09 +0800)
commit67315ad22b2f781fa4364d8a63d784d391a46994
treea7c9d7227667c119aa0114ba2b97125bdb875f10
parentde42b5d7e6f81afbb1f661e81e4c7856e7362477
parent6477dc38824c80183532a427ebe082e29d814867
Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

# Conflicts:
# app/release/output.json
# app/version_code.properties