Commits · 3c7421e469b1ed58b482208153864b2581ac10f6 · wangxiaoming / traffic-front

12 Nov, 2018 15 commits
- [Bugfix] fixed update not correct positon · 3c7421e4
  neo authored Nov 12, 2018
  
  3c7421e4
- [Bugfix] fixed approval use instacneId not taskid · 56afeb8e
  neo authored Nov 12, 2018
  
  56afeb8e
- [Bugfix] fixed select report ids mapper not use annotation · bff27b8c
  neo authored Nov 12, 2018
  
  bff27b8c
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · a40d0be0
  neo authored Nov 12, 2018
  
  a40d0be0
- [Bugfix] fixed select period report mapper · 51201028
  neo authored Nov 12, 2018
  
  51201028
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 63a966bd
  eddie.woo authored Nov 12, 2018
  
  63a966bd
- modify · e3774c2c
  eddie.woo authored Nov 12, 2018
  
  e3774c2c
- [DEV] add control for approval resual · 212f2aad
  neo authored Nov 12, 2018
  
  212f2aad
- [DEV] update approval status and comment to db · dab6c28f
  neo authored Nov 12, 2018
  
  dab6c28f
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 89fcee22
  sherlock authored Nov 12, 2018
```
Dev oracle sherlock

See merge request root/atms!184
```
  89fcee22
- Merge branch 'dev_oracle' into 'dev_oracle_sherlock' · 027c0b45
  sherlock authored Nov 12, 2018
```
# Conflicts:
#   atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
```
  027c0b45
- inputInvoice export · 6913e0dc
  sherlock authored Nov 12, 2018
```
template import
```
  6913e0dc
- [DEV] fixed parameter for appravl skip · 3b897680
  neo authored Nov 12, 2018
  
  3b897680
- [DEV] add approval comment · 10cf66cf
  neo authored Nov 12, 2018
  
  10cf66cf
- [Bugfix] fixed approval skip to report view · 9b6b5b87
  neo authored Nov 12, 2018
  
  9b6b5b87
11 Nov, 2018 8 commits
- [DEV] fixe get template by id not user period template · 0de4d6c1
  neo authored Nov 11, 2018
  
  0de4d6c1
- [Bugfix] fixed sql error for query approval list · e09cb805
  neo authored Nov 11, 2018
  
  e09cb805
- [DEV] fix appoavle info retern and add get first template info · 99b8cb6b
  neo authored Nov 11, 2018
  
  99b8cb6b
- [Bugfix] add miss annoation for getProject by id · e5aafd7d
  neo authored Nov 11, 2018
  
  e5aafd7d
- [DEV] add get project by id · 05a6d667
  neo authored Nov 11, 2018
  
  05a6d667
- [DEV] add project id where retrun approval info · 4a041590
  neo authored Nov 11, 2018
  
  4a041590
- [dev] download report excel sheet · eccb98ba
  neo authored Nov 11, 2018
  
  eccb98ba
- add Exist template · caacb89a
  sherlock authored Nov 11, 2018
  
  caacb89a
10 Nov, 2018 4 commits
- key in & trail balance · c42e9379
  eddie.woo authored Nov 10, 2018
  
  c42e9379
- fix account mapping · 003e71d2
  eddie.woo authored Nov 10, 2018
  
  003e71d2
- [Dev] use JSONFilld decaration reportData · 79fd3dd2
  neo authored Nov 10, 2018
  
  79fd3dd2
- [Dev] add request body for export param · 86b859fe
  neo authored Nov 10, 2018
  
  86b859fe
09 Nov, 2018 13 commits
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 2aae2b3e
  neo.wang authored Nov 09, 2018
```
Dev oracle neo

See merge request root/atms!183
```
  2aae2b3e
- [DEV] split add datasource in gen data · 1201cc95
  neo authored Nov 09, 2018
  
  1201cc95
- [DEV] add munaul cell data and cell data source · 6ea32431
  neo authored Nov 09, 2018
  
  6ea32431
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 8760935f
  eddie.woo authored Nov 09, 2018
  
  8760935f
- modify · 6b7e0730
  eddie.woo authored Nov 09, 2018
  
  6b7e0730
- [Bugfix] fixed re gen bugs · 1e75eb4b
  neo authored Nov 09, 2018
  
  1e75eb4b
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 24ecceed
  sherlock authored Nov 09, 2018
```
bug 19878

See merge request root/atms!182
```
  24ecceed
- bug 19878 · b573730a
  sherlock authored Nov 09, 2018
  
  b573730a
- [DEV] add formual datasorce · ca06f27b
  neo authored Nov 09, 2018
  
  ca06f27b
- [Bugfix] revert add munaul datasource · 52edaa46
  neo authored Nov 09, 2018
  
  52edaa46
- [Bugfix] fixed re gen datasource · 85dc97ea
  neo authored Nov 09, 2018
  
  85dc97ea
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 723e8ef1
  sherlock authored Nov 09, 2018
```
cell data source

See merge request root/atms!181
```
  723e8ef1
- cell data source · 921d1810
  sherlock authored Nov 09, 2018
  
  921d1810