fix mver

vendor/github.com/33cn/chain33/types/config_mver.go

@@ -111,8 +111,14 @@ func (v *versionList) addItem(forkid int64, key, forkname string) error {
 	if len(v.forkname) == 0 {
 		v.forkname = make(map[int64]string)
 	}
+	//这里要允许替换: 有时候会有相同的fork高度
 	if _, ok := v.forkname[forkid]; ok {
-		return fmt.Errorf(key + " same fork height is set: old name is '" + v.forkname[forkid] + "' new name is '" + forkname + "'")
+		//以字母顺序替换
+		if strings.Compare(forkname, v.forkname[forkid]) > 0 {
+			tlog.Warn(key + " same fork height is set: old name is '" + v.forkname[forkid] + "' new name is '" + forkname + "'")
+			v.forkname[forkid] = forkname
+		}
+		return nil
 	}
 	v.forkname[forkid] = forkname
 	v.data = append(v.data, forkid)

vendor/github.com/33cn/chain33/types/testdata/local.mvertest.toml

@@ -82,6 +82,12 @@ name2="ticket-bityuan"
 [mver.consensus.ForkMinerTime]
 name2="ticket-bityuanv5"
 
+[mver.consensus.ForkChainParamV1]
+name2="ticket-bityuanv1"
+
+[mver.consensus.ForkChainParamV2]
+name2="ticket-bityuanv2"
+
 [consensus.sub.ticket]
 genesisBlockTime=1526486816
 [[consensus.sub.ticket.genesis]]