Commits · 4c8882f25fc82aef278630ab15ae8125ed9c31a9 · wangxiaoming / traffic-front

12 Jul, 2018 11 commits
- [DEV] add some data for data save in bb · 4c8882f2
  neo authored Jul 12, 2018
  
  4c8882f2
- Merge branch 'dev' into dev_frank · c1904df7
  frank.xa.zhang authored Jul 12, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/service/impl/CellTemplateServiceImpl.java
```
  c1904df7
- fixed report data review function issue · 1ca129e1
  frank.xa.zhang authored Jul 12, 2018
  
  1ca129e1
- Merge branch 'dev_neo' into 'dev' · 51d7bf58
  neo.wang authored Jul 12, 2018
```
[DEV] change formula data dto to data dto bugs

See merge request root/atms!65
```
  51d7bf58
- [DEV] change formula data dto to data dto bugs · b01d7272
  neo authored Jul 12, 2018
  
  b01d7272
- Merge branch 'dev_neo' into 'dev' · 96abb90a
  neo.wang authored Jul 12, 2018
```
Dev neo

See merge request root/atms!64
```
  96abb90a
- Merge branch 'dev' of code.tech.tax.asia.pwcinternal.com:root/atms into dev · ccf0112a
  neo authored Jul 12, 2018
  
  ccf0112a
- [DEV] fixed some bugs and save data source for bb close · f46dee64
  neo authored Jul 12, 2018
  
  f46dee64
- [DEV] add project query form formular context · bc3b8bb9
  neo authored Jul 12, 2018
  
  bc3b8bb9
- Merge branch 'dev_neo' into 'dev' · b9b5e708
  neo.wang authored Jul 12, 2018
```
[DEV] bb formular args context fixed

See merge request root/atms!61
```
  b9b5e708
- [DEV] bb formular args context fixed · 0ffde69d
  neo authored Jul 12, 2018
  
  0ffde69d
11 Jul, 2018 10 commits
- Merge branch 'dev' into dev_frank · 9ae926d1
  frank.xa.zhang authored Jul 11, 2018
  
  9ae926d1
- add report view backend code · 3b1cda94
  frank.xa.zhang authored Jul 11, 2018
  
  3b1cda94
- Merge branch 'dev_neo' into 'dev' · 77dfceae
  neo.wang authored Jul 11, 2018
```
[DEV] use wrapclient with short ftpclient connection

See merge request root/atms!60
```
  77dfceae
- [DEV] use wrapclient with short ftpclient connection · 0bea477b
  neo.wang authored Jul 11, 2018
  
  0bea477b
- Merge branch 'dev_neo' into 'dev' · e8293302
  neo.wang authored Jul 11, 2018
```
[DEV] fixed validate object for ftpclient

See merge request root/atms!59
```
  e8293302
- [DEV] fixed validate object for ftpclient · 2e61cb2f
  neo.wang authored Jul 11, 2018
  
  2e61cb2f
- Merge branch 'dev_neo' into 'dev' · 2c8f3c02
  neo.wang authored Jul 11, 2018
```
Dev neo

See merge request root/atms!58
```
  2c8f3c02
- [DEV] ftp upload and down load file · 19dafa28
  neo.wang authored Jul 11, 2018
  
  19dafa28
- Merge branch 'dev_neo' of 10.157.107.88:root/atms into dev_neo_ftp · d307438b
  neo.wang authored Jul 11, 2018
  
  d307438b
- [DEV] add log for ftp client factory · 5c5a94bb
  neo authored Jul 11, 2018
  
  5c5a94bb
10 Jul, 2018 4 commits
- fixed front end display report · ea74a6a8
  frank.xa.zhang authored Jul 10, 2018
  
  ea74a6a8
- [DEV] ftp download transfer stream us byte array · 95ae2245
  neo authored Jul 10, 2018
  
  95ae2245
- Merge branch 'dev' into dev_frank · 89c2475c
  frank.xa.zhang authored Jul 10, 2018
  
  89c2475c
- fixed issues with POM issue · b73d9830
  frank.xa.zhang authored Jul 10, 2018
  
  b73d9830
09 Jul, 2018 15 commits
- Merge branch 'dev_neo' into 'dev' · 41851f27
  neo.wang authored Jul 09, 2018
```
Dev neo

See merge request root/atms!57
```
  41851f27
- Merge branch 'dev_neo' of code.tech.tax.asia.pwcinternal.com:root/atms into cglibproxy · fe4fe816
  neo authored Jul 09, 2018
  
  fe4fe816
- [DEV] get template json api you hua · 0416601a
  neo authored Jul 09, 2018
  
  0416601a
- [DEV] get template json api you hua · 77660bae
  neo authored Jul 09, 2018
  
  77660bae
- Merge branch 'dev' into dev_frank · ba76c7eb
  frank.xa.zhang authored Jul 09, 2018
  
  ba76c7eb
- remove blank · ac09da2d
  frank.xa.zhang authored Jul 09, 2018
  
  ac09da2d
- Merge branch 'dev_neo' into 'dev' · d7aaf7ed
  neo.wang authored Jul 09, 2018
```
[DEV] delete some not useful plugin for maven

See merge request root/atms!55
```
  d7aaf7ed
- [DEV] delete some not useful plugin for maven · 07d69012
  neo authored Jul 09, 2018
  
  07d69012
- Merge branch 'dev_neo' into 'dev' · daacc806
  neo.wang authored Jul 09, 2018
```
[DEV] delete some spring devpendence for web

See merge request root/atms!54
```
  daacc806
- [DEV] delete some spring devpendence for web · 5f50c864
  neo authored Jul 09, 2018
  
  5f50c864
- Merge branch 'dev_neo' into 'dev' · c98f9d94
  neo.wang authored Jul 09, 2018
```
[DEV] delete email bean config

See merge request root/atms!53
```
  c98f9d94
- [DEV] delete email bean config · 59ba591d
  neo authored Jul 09, 2018
  
  59ba591d
- Merge branch 'dev_neo' into 'dev' · 38b8c3b9
  neo.wang authored Jul 09, 2018
```
[DEV] mvn dependence invert commit sqlserver

See merge request root/atms!52
```
  38b8c3b9
- [DEV] mvn dependence invert commit sqlserver · fb3b7a65
  neo authored Jul 09, 2018
  
  fb3b7a65
- Merge branch 'dev_neo' into 'dev' · e5e32fcf
  neo.wang authored Jul 09, 2018
```
Dev neo

See merge request root/atms!51
```
  e5e32fcf