Merge branch 'merge_2020_06_16' of gitee.com:prowo_admin/bishe into newWeiXing

Status Job ID Name Coverage
  Build
failed #712
build

 
  Test
skipped #713
allowed to fail
code_quality
failed #714
test

 
Name Stage Failure
failed
test Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log