Merge branch 'dev' into 'master'

合并dev内容 See merge request !29
7 jobs from master in 15 seconds (queued for 15 seconds)
Status Job ID Name Coverage
  Init
failed #77274
init

00:15

failed #77269
init

00:14

failed #76946
init

00:14

failed #76933
init

00:15

 
  Bootstrap
skipped #76934
bootstrap
 
  Build
skipped #76935
build
 
  Release
skipped #76936
release
 
Name Stage Failure
failed
init Init
Skipping Git submodules setup
����λ�� C:\Users\Administrator\AppData\Local\Temp\build_script664719634\script.ps1:163 �ַ�: 13
+ npm install && echo ��װ����
+ ~~
���ǡ�&&�����Ǵ˰汾�е���Ч�����ָ�����
+ CategoryInfo : ParserError: (:) [], ParseException
+ FullyQualifiedErrorId : InvalidEndOfLine

ERROR: Job failed: exit status 1