Commits · aa8e1c625edb1586c778be5e059ff90be9407401 · wangxiaoming / traffic-front

04 Jul, 2018 13 commits
- Merge branch 'dev_frank' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_frank · aa8e1c62
  frank.xa.zhang authored Jul 04, 2018
  
  aa8e1c62
- Merge branch 'dev' into dev_frank · e50a0ca6
  frank.xa.zhang authored Jul 04, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FormulaContext.java
```
  e50a0ca6
- add function FSJZ(Not finished yet) · e513ff23
  frank.xa.zhang authored Jul 04, 2018
  
  e513ff23
- Merge branch 'dev' into dev_frank · 986664f4
  frank.xa.zhang authored Jul 04, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FormulaContext.java
```
  986664f4
- add function FSJZ(Not finished yet) · 23a0a809
  frank.xa.zhang authored Jul 04, 2018
  
  23a0a809
- Merge branch 'dev_frank' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_frank · e8d18112
  frank.xa.zhang authored Jul 04, 2018
  
  e8d18112
- Merge branch 'dev' into dev_frank · 9d7a6ff3
  frank.xa.zhang authored Jul 04, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FormulaContext.java
```
  9d7a6ff3
- add function FSJZ(Not finished yet) · 9420700e
  frank.xa.zhang authored Jul 04, 2018
  
  9420700e
- Merge branch 'dev' into dev_frank · 24ccf407
  frank.xa.zhang authored Jul 04, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FormulaContext.java
```
  24ccf407
- Merge branch 'dev' into dev_frank · 6827f086
  frank.xa.zhang authored Jul 04, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FormulaContext.java
```
  6827f086
- add function FSJZ(Not finished yet) · f8ee5152
  frank.xa.zhang authored Jul 04, 2018
  
  f8ee5152
- Merge branch 'dev_neo' into 'dev' · 788e071a
  neo.wang authored Jul 04, 2018
```
Dev neo

See merge request root/atms!46
```
  788e071a
- [DEV] add lombox dependence · a937fac7
  neo authored Jul 04, 2018
  
  a937fac7
03 Jul, 2018 9 commits
- [DEV] query cell template per group dto · a50bec33
  neo authored Jul 03, 2018
  
  a50bec33
- Merge branch 'dev_neo' into 'dev' · 64a1d633
  neo.wang authored Jul 03, 2018
```
[DEV] report formular base factory

See merge request root/atms!45
```
  64a1d633
- [DEV] report formular base factory · ce226612
  neo authored Jul 03, 2018
  
  ce226612
- add mapper agent · 4bf47c77
  frank.xa.zhang authored Jul 03, 2018
  
  4bf47c77
- Merge branch 'dev' into dev_frank · c1b08986
  frank.xa.zhang authored Jul 03, 2018
  
  c1b08986
- add function SGSR method · 7f336aed
  frank.xa.zhang authored Jul 03, 2018
  
  7f336aed
- Merge branch 'dev_neo' into 'dev' · 269b7466
  neo.wang authored Jul 03, 2018
```
[DEV] defind formular common dto or context

See merge request root/atms!44
```
  269b7466
- [DEV] defind formular common dto or context · f5c588bc
  neo authored Jul 03, 2018
  
  f5c588bc
- add new api for report generate with work flow and data save · b3ec20cc
  frank.xa.zhang authored Jul 03, 2018
  
  b3ec20cc
02 Jul, 2018 4 commits
- Merge branch 'dev' into dev_frank · 444ed5a1
  frank.xa.zhang authored Jul 02, 2018
  
  444ed5a1
- add new api voucherSelectAdvancedByVoucher · b8995e16
  frank.xa.zhang authored Jul 02, 2018
  
  b8995e16
- Merge branch 'dev_neo' into 'dev' · 416ad1c6
  neo.wang authored Jul 02, 2018
```
[DEV] fixed template group self defind sql

See merge request root/atms!43
```
  416ad1c6
- [DEV] fixed template group self defind sql · 940f57c3
  neo authored Jul 02, 2018
  
  940f57c3
28 Jun, 2018 4 commits
- Merge branch 'dev_neo' into 'dev' · acfd3c60
  neo.wang authored Jun 28, 2018
```
[bug] fixed dbname is wrong for porject add

See merge request root/atms!42
```
  acfd3c60
- [bug] fixed dbname is wrong for porject add · 63108bf2
  neo authored Jun 28, 2018
  
  63108bf2
- Merge branch 'dev_neo' into 'dev' · 786b99a7
  neo.wang authored Jun 28, 2018
```
Dev neo

See merge request root/atms!40
```
  786b99a7
- [BUG] bug fiex db cannot creat when add project · f31033d6
  neo authored Jun 28, 2018
  
  f31033d6
26 Jun, 2018 1 commit
- [DEV] deltete CompanyBalanceDto and reference · 69146937
  neo authored Jun 26, 2018
  
  69146937
25 Jun, 2018 9 commits
- Merge branch 'dev_neo' into 'dev' · 56492875
  neo.wang authored Jun 25, 2018
```
Dev neo

See merge request root/atms!39
```
  56492875
- [DEV] getCustomsInvoicesValidates impl · 068a0753
  neo authored Jun 25, 2018
  
  068a0753
- Merge branch 'dev' into dev_frank · ba172580
  frank.xa.zhang authored Jun 25, 2018
  
  ba172580
- [fixed issue] report config renew with new table · 5b968322
  frank.xa.zhang authored Jun 25, 2018
  
  5b968322
- [DEV] input invoice get item impl · 0bf47e57
  neo authored Jun 25, 2018
  
  0bf47e57
- Merge branch 'dev_neo' into 'dev' · cb8c7d2f
  neo.wang authored Jun 25, 2018
```
[DEV] output vat invoice getlist impl

See merge request root/atms!38
```
  cb8c7d2f
- [DEV] output vat invoice getlist impl · d9a990d2
  neo authored Jun 25, 2018
  
  d9a990d2
- Merge branch 'dev_neo' into 'dev' · 70e85bf1
  neo.wang authored Jun 25, 2018
```
[DEV] re build voucher mapper

See merge request root/atms!37
```
  70e85bf1
- [DEV] re build voucher mapper · 2ec9521c
  neo authored Jun 25, 2018
  
  2ec9521c