Commits · b44cc9f0a863ce70f4e7daec7fa7669952dce60d · wangxiaoming / traffic-front

16 Jul, 2018 7 commits
- Merge branch 'dev_neo' into 'dev' · b44cc9f0
  neo.wang authored Jul 16, 2018
```
Dev neo

See merge request root/atms!71
```
  b44cc9f0
- [Bugfix] fixed current year by bb para no use content · 900b46ef
  neo authored Jul 16, 2018
  
  900b46ef
- [Bugfix] period args get wrong in bb formula · 5deb68de
  neo authored Jul 16, 2018
  
  5deb68de
- Merge branch 'dev_neo' into 'dev' · 2487f476
  neo.wang authored Jul 16, 2018
```
[DEV] query all project distinct

See merge request root/atms!70
```
  2487f476
- [DEV] query all project distinct · 0a70c86f
  neo authored Jul 16, 2018
  
  0a70c86f
- Merge branch 'dev_neo' into 'dev' · 236d84d5
  neo.wang authored Jul 16, 2018
```
[DEV] fixed create project and del some not used java

See merge request root/atms!69
```
  236d84d5
- [DEV] fixed create project and del some not used java · b371a2da
  neo authored Jul 16, 2018
  
  b371a2da
13 Jul, 2018 10 commits
- Merge branch 'dev' into dev_frank · c8b6338d
  frank.xa.zhang authored Jul 13, 2018
  
  c8b6338d
- fixed issues about create new db · a3310810
  frank.xa.zhang authored Jul 13, 2018
  
  a3310810
- fixed issues for the new apis · a2cde1f4
  frank.xa.zhang authored Jul 13, 2018
  
  a2cde1f4
- add some apis for report cell pop up window · 15990732
  frank.xa.zhang authored Jul 13, 2018
  
  15990732
- Merge branch 'dev_neo' into 'dev' · 577a7b36
  neo.wang authored Jul 13, 2018
```
[DEV] add default remap batch id

See merge request root/atms!68
```
  577a7b36
- [DEV] add default remap batch id · 6063f0b3
  neo authored Jul 13, 2018
  
  6063f0b3
- fixed issues for formula validate · cb092a3f
  frank.xa.zhang authored Jul 13, 2018
  
  cb092a3f
- Merge branch 'dev_neo' into 'dev' · a5d269b1
  neo.wang authored Jul 13, 2018
```
Dev neo

See merge request root/atms!67
```
  a5d269b1
- [DEV] delete formula factory and use formula base · ca1d2cdd
  neo authored Jul 13, 2018
  
  ca1d2cdd
- [bugfix] formula datasource insert use cell datasouce · f1d87ace
  neo authored Jul 13, 2018
  
  f1d87ace
12 Jul, 2018 12 commits
- Merge branch 'dev_neo' into 'dev' · 7d75d2c6
  neo.wang authored Jul 12, 2018
```
[DEV] add some  data for data save in bb

See merge request root/atms!66
```
  7d75d2c6
- [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 1 commit
- fixed front end display report · ea74a6a8
  frank.xa.zhang authored Jul 10, 2018
  
  ea74a6a8