三证合一，合并

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertsub.go

@@ -366,9 +366,9 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 				var entity supplierfile.OilSupplierFile
 				entity.SupplierId = dataother.SupplierId
 
-				/*if supplierModel.CredentialFlag != "1" && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
+				if (supplierModel.CredentialFlag == "1" || supplierModel.CredentialFlag == "2") && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
 					continue
-				}*/
+				}
 
 				if strings.Contains(mustField, needList[i].FileName+",") {
 					entity.SupplierTypeCode = "000"