Download as
Browse Code »

Commit 64746449d20348e731e62343dcab775fe91dc3d9

Authored by erick.sato
2 parents 26fcf49d 3eeb3c8f
Exists in master

Merge branch 'adm-1.15.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… 

…cit-grp-adm-materiais into adm-1.15.0

# Conflicts:
#	cit-adm-materiais-api/src/main/resources/scripts-bd/postgres/v1.15.0/01-cit-adm-materiais-v1.15.0-postgres.sql
Showing 1 changed file with 7 additions and 2 deletions   Show diff stats
cit-adm-materiais-api/src/main/resources/scripts-bd/postgres/v1.15.0/01-cit-adm-materiais-v1.15.0-postgres.sql
  Diff comments   View file @6474644
@@ -1575,7 +1575,12 @@ CREATE TABLE alm_ee_transferencia_aud @@ -1575,7 +1575,12 @@ CREATE TABLE alm_ee_transferencia_aud
1575 CONSTRAINT alm_ee_transferencia_aud_pkey PRIMARY KEY (id, rev) 1575 CONSTRAINT alm_ee_transferencia_aud_pkey PRIMARY KEY (id, rev)
1576 ); 1576 );
1577 1577
1578 --- ERICK FIM 09/05/2016 1578 +
  1579 +-- RONAN INICIO 09/05/2016 --
  1580 +ALTER TABLE alm_me_localestoque_aud ADD COLUMN capacidade NUMERIC(19,2);
  1581 +
  1582 +update pessoa set email = null where email = ' ';
  1583 +-- RONAN FIM 09/05/2016
1579 1584
1580 -- ERick INICIO 10/05/2016 1585 -- ERick INICIO 10/05/2016
1581 /* 1586 /*
@@ -1603,4 +1608,4 @@ END LOOP; @@ -1603,4 +1608,4 @@ END LOOP;
1603 END$$; 1608 END$$;
1604 1609
1605 */ 1610 */
1606 --- ERICK FIM 10/05/2016  
1607 \ No newline at end of file 1611 \ No newline at end of file
  1612 +-- ERICK FIM 10/05/2016