Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
authork.liang <liangkang648253071@126.com>
Tue, 28 Dec 2021 03:06:36 +0000 (11:06 +0800)
committerk.liang <liangkang648253071@126.com>
Tue, 28 Dec 2021 03:06:36 +0000 (11:06 +0800)
commit68f97e261a56172e78b2824fe7a6c1197994919d
treef30569c8dd334e71f3836398f9e63a30422f5f9a
parent67315ad22b2f781fa4364d8a63d784d391a46994
parent8f359109e445e08cd9f5aa65be25278fb83cb010
Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

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