From: k.liang <liangkang648253071@126.com>
Date: Fri, 30 Jul 2021 03:46:09 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=5f51bf2df85287a25b7d8eb65f2c0519e263b35a;p=protocol_srv.git

Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

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

5f51bf2df85287a25b7d8eb65f2c0519e263b35a