fix: 处理冲突

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

01:22

 
  Package
manual #264112
civ_base manual
package
 
  Push
created #264114
civ_base
push2021
created #264113
civ_base
pushSolution