src/main/resources · 8ad602d1c047a5c3ce41174c52f6fa604a6449ed · 15所TongWeb / aserver

Merge remote-tracking branch 'origin/SZDAS_V2.0' into SZDAS_V2.0 · 8ad602d1

authored Apr 14, 2021

# Conflicts:
#	src/main/resources/DBUpdate/DM_UpdateSQL.xml
#	src/main/resources/DBUpdate/KINGBASE_UpdateSQL.xml
#	src/main/resources/DBUpdate/ST_UpdateSQL.xml

8ad602d1

Name	Last commit	Last update
..
DBUpdate		Loading commit data...
AppConfig-pro.properties		Loading commit data...
AppConfig.properties		Loading commit data...
KingBase-dialect.sql		Loading commit data...
SN.properties		Loading commit data...
ST-dialect.sql		Loading commit data...
log4j.properties		Loading commit data...
logging.properties		Loading commit data...
logo.png		Loading commit data...
message.sql		Loading commit data...
oracle.sql		Loading commit data...
task.properties		Loading commit data...
undertow.properties		Loading commit data...