Commits · a4a0b30064496ed3565b9e89722dbb32c92f90a9 · wangxiaoming / traffic-front

08 Oct, 2018 4 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · a4a0b300
  sherlock authored Oct 08, 2018
```
datasources2 properties

See merge request root/atms!138
```
  a4a0b300
- datasources2 properties · fa864071
  sherlock authored Oct 08, 2018
  
  fa864071
- Merge branch 'dev_oracle' into dev_oracle_frank · b202a470
  frank.xa.zhang authored Oct 08, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
#	atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodDataSourceMapper.java
#	atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodDataSourceExtendsMapper.xml
```
  b202a470
- add parameter for some method · 225e4abf
  frank.xa.zhang authored Oct 08, 2018
  
  225e4abf
03 Oct, 2018 18 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 1730f6ac
  sherlock authored Oct 03, 2018
```
another dataSource

See merge request root/atms!137
```
  1730f6ac
- another dataSource · f4f918e1
  sherlock authored Oct 03, 2018
  
  f4f918e1
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 9e2a6a9a
  neo.wang authored Oct 03, 2018
```
Dev oracle neo

See merge request root/atms!136
```
  9e2a6a9a
- [buffix] delete parameter not define · e2447c96
  neo authored Oct 03, 2018
  
  e2447c96
- [bugfix] fixed bug for sql maaper · f590b74b
  neo authored Oct 03, 2018
  
  f590b74b
- [bugfix] add period for get annoation sql · deb00558
  neo authored Oct 03, 2018
  
  deb00558
- [bufix] xml filer parameter is wrong for ID actual id · 2a5f6b87
  neo authored Oct 03, 2018
  
  2a5f6b87
- [bufix] double period in formulablock xml · dccdcf95
  neo authored Oct 03, 2018
  
  dccdcf95
- [dev] temp use o for report id · 040ffc4f
  neo authored Oct 03, 2018
  
  040ffc4f
- [bugfix] fixed period to cell data when insert to db · 8815bb16
  neo authored Oct 03, 2018
  
  8815bb16
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 2fe7e9f1
  sherlock authored Oct 03, 2018
```
basicData module test and correct

See merge request root/atms!135
```
  2fe7e9f1
- [dev] replace periodModiieReportCell mapp entity example · ab99eea9
  neo authored Oct 03, 2018
  
  ab99eea9
- basicData module test and correct · 2e9e0e94
  sherlock authored Oct 03, 2018
  
  2e9e0e94
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 741e5827
  neo.wang authored Oct 03, 2018
```
Dev oracle neo

See merge request root/atms!134
```
  741e5827
- [dev] add append period to should benin period table in xml · 5a356442
  neo authored Oct 03, 2018
  
  5a356442
- [bugfix] wrapp comment keyword in xml · 480112ff
  neo authored Oct 03, 2018
  
  480112ff
- [bufix] delete pwc.com from value · 51ddf3fa
  neo authored Oct 03, 2018
  
  51ddf3fa
- [dev] add fixed from value to projectid instead of dbname · cc6e37da
  neo authored Oct 03, 2018
  
  cc6e37da
02 Oct, 2018 18 commits
- [dev] save datasource add projcect id from content · 73740947
  neo authored Oct 02, 2018
  
  73740947
- [fixbug] fixed bugs for missed projectid and period · 85911d18
  neo authored Oct 02, 2018
  
  85911d18
- [bugfix] add project and preirod · 15731d2b
  neo authored Oct 02, 2018
  
  15731d2b
- [bugfix] query add project id used in period table · 99c01c41
  neo authored Oct 02, 2018
  
  99c01c41
- [bugfix] use upd config selece by key · 62a560ba
  neo authored Oct 02, 2018
  
  62a560ba
- [bugfix] fixed clear data should use not in but use in · 2a09175a
  neo authored Oct 02, 2018
  
  2a09175a
- [bugfix] fixed xml sql error for invalid host/bind · 665590be
  neo authored Oct 02, 2018
  
  665590be
- [bugfix] fix bb null is not insert when insert datasource · 7330852f
  neo authored Oct 02, 2018
  
  7330852f
- [dev] fix period template and cell not found project id in xml · 189b3fc9
  neo authored Oct 02, 2018
  
  189b3fc9
- [dev] re open comment set entity when update config · 9c69f649
  neo authored Oct 02, 2018
  
  9c69f649
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 705fa1c9
  neo.wang authored Oct 02, 2018
```
Dev oracle neo

See merge request root/atms!132
```
  705fa1c9
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · db1e59fc
  sherlock authored Oct 02, 2018
```
basicData module test and correct

See merge request root/atms!131
```
  db1e59fc
- [bugfix] add default long max for querylist · 5e27a921
  neo authored Oct 02, 2018
  
  5e27a921
- [dev] use max_long_value as default in list · ee6cbf7e
  neo authored Oct 02, 2018
  
  ee6cbf7e
- [dev] use null not space · 644773d5
  neo authored Oct 02, 2018
  
  644773d5
- [bugfix] fixed sql use space not empty in batch insert period config · 3069f24d
  neo authored Oct 02, 2018
  
  3069f24d
- [bugfix] fixed bugs for field error in sql · 6126e0cf
  neo authored Oct 02, 2018
  
  6126e0cf
- [dev] fix sql bugs · 22465cb1
  neo authored Oct 02, 2018
  
  22465cb1