Merge branch 'ETA_1.6.4' into debug

# Conflicts:
#	models/db.go

models/db.go

@@ -124,6 +124,7 @@ func initBaseIndex() {
 		new(BaseFromCoalmineCoastalIndex),
 		new(BaseFromCoalmineInlandIndex),
 		new(BaseFromCoalmineCompanyIndex),
+		new(BaseFromCoalmineFirmIndex),
 		new(BaseFromFenweiIndex),
 		new(BaseFromFenweiData),
 		new(BaseFromMtjhMapping),