Commits · 44ad4bf04da60bdf0a9889de41d62f6091190333 · wangxiaoming / traffic-front

09 Oct, 2018 20 commits
- [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 10 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
- add parameter for some method · 225e4abf
  frank.xa.zhang authored Oct 08, 2018
  
  225e4abf
04 Oct, 2018 1 commit
- [bugfix] use rownum instead of limit · 5bf5cf24
  neo authored Oct 04, 2018
  
  5bf5cf24
03 Oct, 2018 9 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