feat: 冲突处理

Status Job ID Name Coverage
  Refresh
manual #282867
civ_base allowed to fail manual
refresh
 
  Install
passed #282868
civ_base allowed to fail manual
install

01:33

 
  Package
passed #282869
civ_base manual
package

07:27

 
  Push
passed #282871
civ_base
push2021

02:25

passed #282870
civ_base
pushSolution

00:29