Merge branch 'dev' into 'master'

feat: 二连浩特登录 See merge request !13
Status Job ID Name Coverage
  Install
manual #190596
civ_base allowed to fail manual
install
 
  Package
passed #190597
civ_base manual
package

02:19

 
  Push Solution
passed #190598
civ_base
pushSolution

00:21

 
  Push2021
passed #190599
civ_base
push2021

00:53