Merge branch 'release' into dev-130

# Conflicts:
#	server/pom.xml
1 job for <span class="ref-name">dev-130</span> in 0 second
状态 作业 ID 名称 覆盖率
  Test
已失败 #16656
pica
sonar_analyze

00:00:00

 
名称 暂存 失败
已失败
sonar_analyze Test There is an unknown failure, please try again
Running on gitlab.example.com...
Fetching changes...
HEAD is now at c233c3d 20191101 完善客服系统添加医生逻辑
From http://192.168.110.53/com.pica.cloud.account/pica-cloud-account
d5b220b..987137b dev-130 -> origin/dev-130
Checking out 987137bf as dev-130...
$ ./sonar_analyze.sh
bash: line 43: ./sonar_analyze.sh: Permission denied
ERROR: Build failed: exit status 1