Commits · 66cfa607970a95643ad2e887d590d2f82f757978 · wangxiaoming / traffic-front

06 Jul, 2018 4 commits
- Merge branch 'dev' into dev_frank · 66cfa607
  frank.xa.zhang authored Jul 06, 2018
  
  66cfa607
- remove blank · c4aa6b8f
  frank.xa.zhang authored Jul 06, 2018
  
  c4aa6b8f
- Merge remote-tracking branch 'origin/dev_frank' into dev_frank · 0cb27a3b
  frank.xa.zhang authored Jul 06, 2018
  
  0cb27a3b
- test and fixed issues · 085f4ee4
  frank.xa.zhang authored Jul 06, 2018
  
  085f4ee4
05 Jul, 2018 10 commits
- Merge branch 'dev_neo' into 'dev' · 3d324f46
  neo.wang authored Jul 05, 2018
```
Dev neo

See merge request root/atms!49
```
  3d324f46
- [DEV] optimized code for bb formula · 729b3949
  neo authored Jul 05, 2018
  
  729b3949
- [DEV] delete bb reference formula cacls · 3765bc20
  neo authored Jul 05, 2018
  
  3765bc20
- [DEV] bb formula impl · b22c475a
  neo authored Jul 05, 2018
  
  b22c475a
- fix · 9635d342
  eddie.woo authored Jul 05, 2018
  
  9635d342
- Merge branch 'dev_frank' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_frank · 91005b70
  frank.xa.zhang authored Jul 05, 2018
  
  91005b70
- finished fsjz function · b607b235
  frank.xa.zhang authored Jul 05, 2018
  
  b607b235
- fix · b37e1406
  eddie.woo authored Jul 05, 2018
  
  b37e1406
- finished fsjz function · ae9e7f5e
  frank.xa.zhang authored Jul 05, 2018
  
  ae9e7f5e
- fix · 882f0444
  eddie.woo authored Jul 05, 2018
  
  882f0444
04 Jul, 2018 18 commits
- Merge branch 'dev_neo' into 'dev' · 54239090
  neo.wang authored Jul 04, 2018
```
Dev neo

See merge request root/atms!48
```
  54239090
- [DEV] change ftp server to 003 · 8d258f2d
  neo authored Jul 04, 2018
  
  8d258f2d
- [Bugfix] add lose enum data source type · e297e2b7
  neo authored Jul 04, 2018
  
  e297e2b7
- [DEV] change package of NPOIHelper and some bb logic · 619c3b8b
  neo authored Jul 04, 2018
  
  619c3b8b
- finished fsjz function · 0f67a6e0
  frank.xa.zhang authored Jul 04, 2018
  
  0f67a6e0
- 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 8 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