Commits · 2d4ffbb9c82f72982177833781b3d7ba77ae62d3 · wangxiaoming / traffic-front

09 Oct, 2018 31 commits
- [DEL] delete cell template service interface · 2d4ffbb9
  neo authored Oct 09, 2018
  
  2d4ffbb9
- [DEL] delete cache service interface · b5a17c2b
  neo authored Oct 09, 2018
  
  b5a17c2b
- [DEL] delete business unit service interface · cbd872cb
  neo authored Oct 09, 2018
  
  cbd872cb
- [DEL] delete area service interface · bad48a9d
  neo authored Oct 09, 2018
  
  bad48a9d
- [DEL] delete common service interface · 9ab96cbf
  neo authored Oct 09, 2018
  
  9ab96cbf
- [DEL] delete customer service interface · 0ad0d662
  neo authored Oct 09, 2018
  
  0ad0d662
- [DEL] delete dimension service interface · 0f6af6c2
  neo authored Oct 09, 2018
  
  0f6af6c2
- [DEL] delete enterprise account set service interface · 2af32692
  neo authored Oct 09, 2018
  
  2af32692
- [DEL] delete formula service interface · e8d180c5
  neo authored Oct 09, 2018
  
  e8d180c5
- [DEL] delete key value config service interface · 53bc8a3d
  neo authored Oct 09, 2018
  
  53bc8a3d
- [DEL] delete menu service interface · 799bb62a
  neo authored Oct 09, 2018
  
  799bb62a
- [DEL] delete organization service interface · 44ad4bf0
  neo authored Oct 09, 2018
  
  44ad4bf0
- [DEL] delete organization structrue service interface · 0a050f4a
  neo authored Oct 09, 2018
  
  0a050f4a
- [DEL] delete permission service interface · 819be5cb
  neo authored Oct 09, 2018
  
  819be5cb
- [DEL] delete project infor service interface · a6b39d64
  neo authored Oct 09, 2018
  
  a6b39d64
- [DEL] delete project service interface · dad61b11
  neo authored Oct 09, 2018
  
  dad61b11
- [DEL] delete project status manager service interface · e868e805
  neo authored Oct 09, 2018
  
  e868e805
- [DEL] delete region service interface · d51f521f
  neo authored Oct 09, 2018
  
  d51f521f
- [DEL] delete role service interface · 6c2fad8b
  neo authored Oct 09, 2018
  
  6c2fad8b
- [DEL] delete rule enginee config servie interface · 2778073a
  neo authored Oct 09, 2018
  
  2778073a
- [DEL] delete statistic attribute service interface · 06845d50
  neo authored Oct 09, 2018
  
  06845d50
- [DEL] delete std accounts service interface · 50f27a31
  neo authored Oct 09, 2018
  
  50f27a31
- [DEL] delete template group service interface · 269461ff
  neo authored Oct 09, 2018
  
  269461ff
- [DEL] delete template service interface · da07108e
  neo authored Oct 09, 2018
  
  da07108e
- [DEV] delete user account service interface · 8e57f0ba
  neo authored Oct 09, 2018
  
  8e57f0ba
- [DEL] delete user role service interface · fe31a606
  neo authored Oct 09, 2018
  
  fe31a606
- [DEL] delete user service interface · fddbf6b9
  neo authored Oct 09, 2018
  
  fddbf6b9
- [DEL] delete single methond service · 13792da2
  neo authored Oct 09, 2018
  
  13792da2
- [dev] delete unused single java · ee2fc699
  neo authored Oct 09, 2018
  
  ee2fc699
- [dev] fix ojdbc import use local maven repository · b1319068
  neo authored Oct 09, 2018
  
  b1319068
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 070c5ba1
  neo.wang authored Oct 09, 2018
```
Dev oracle neo

See merge request root/atms!139
```
  070c5ba1
08 Oct, 2018 9 commits
- [bugfix] use poject to join two tables · a2d938f7
  neo authored Oct 08, 2018
  
  a2d938f7
- [bugfix] fixed datasource query xml join two table with projecti d · 16b1e5c8
  neo authored Oct 08, 2018
  
  16b1e5c8
- [dev] use id no ID for formuaParaDto · 832950c9
  neo authored Oct 08, 2018
  
  832950c9
- [dev] add projectid for get cell tenplate · 9372ce69
  neo authored Oct 08, 2018
  
  9372ce69
- [bugfix] add projectid to mapper paramap · 78034487
  neo authored Oct 08, 2018
  
  78034487
- 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
- [dev] add project id for getcelltemplate where save bb datasoruce · 333de3b8
  neo authored Oct 08, 2018
  
  333de3b8
- 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