冲突

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -215,7 +215,7 @@ func (s *OilSupplierService) GetMyTodoEntitie(supplierTableName, supplierCertTab
 func (s *OilSupplierService) GetExpireFile(supplierTableName, supplierFileTableName string, entitiesPtr interface{}, where string) error {
 
 	var sql string
-	sql = `SELECT a.Id, a.SupplierName, a.Mobile, b.SupplierTypeCode,a.CreateBy, a.ContactName, a.CreateUserId, GROUP_CONCAT(b.NeedFileType SEPARATOR ';' ) NeedAllFile  `
+	sql = `SELECT a.Id, a.SupplierName, a.Mobile, a.CreateBy, a.ContactName, a.CreateUserId, GROUP_CONCAT(b.NeedFileType SEPARATOR ';' ) NeedAllFile  `
 	sql += ` FROM ` + supplierTableName + ` a `
 	sql += ` left join ` + supplierFileTableName + " b ON a.Id=b.SupplierId "
 	sql += ` where ` + where