Merge remote-tracking branch 'origin/release' into dev-cancel-1207

# Conflicts:
#	server/src/main/resources/bootstrap-dev.properties
#	server/src/main/resources/bootstrap-test1.properties
#	server/src/main/resources/bootstrap-uat.properties
1 job for <span class="ref-name">dev-cancel-1207</span>
状态 作业 ID 名称 覆盖率
  Test
已失败 #41122
pica
sonar_analyze

 
名称 暂存 失败
已失败
sonar_analyze Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace