Merge branch 'master' into 'production-stage'

合并开发分支到 stage 分支

See merge request !266 (merged)

(cherry picked from commit b4fcac32)

57f4e42e Merge branch 'production-stage' into 'master' eea8f322 Merge branch 'production-stage' into 'master' 9b4cf30f Merge branch 'production-stage' into 'master' 834d51b3 fix: 商城删除服务铃 cf6fdbcb feat: 服务铃&语音搜索 GD-1275 f858cc92 Merge branch master 550e16f8 Merge branch 'dev/ming.liu' into 'master' 0761c937 Merge branch 'production-stage' into merge_0218 18a5fa3a Merge branch 'merge_0218' into 'master' 9fe88906 feat: GD-1267 手机外预约堂食 af641831 Merge branch 'feat/hsz' into 'master' 83fce364 feat: batchPay支付添加 appId ed4241de feat: batchPay支付添加 appId f8bcb648 feat: batchPay支付添加 appId caa951b3 Merge branch 'feat/gsd_0227' into 'master' f70d03ee feat: 那美小程序校验文件 d2e778b6 Merge branch 'feat/gsd_0227' into 'master' fb9b6e0b fix: GD-1267 手机外预约堂食 20ca2162 Merge branch 'fix/hsz' into 'master' f4116ba5 fix: 管理订单级预约时间，没有订单级餐品，就清空 startTime b7d3a731 Merge branch 'feat/gsd_0227' into 'master' 57afaf70 feat: 点单页广告异步情况展示 446740f2 Merge branch 'feat/gsd_0227' into 'master'