Commits · 9ce17d43d17ab0aed79eb68541b6e92a4acaa2a4 · wangxiaoming / traffic-front

28 Sep, 2018 6 commits
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms… · 9ce17d43
  frank.xa.zhang authored Sep 28, 2018
```
Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle_frank
```
  9ce17d43
- change form parameter to projectId · 4895f6c9
  frank.xa.zhang authored Sep 28, 2018
  
  4895f6c9
- fixed admin issue · 68f30e0a
  frank.xa.zhang authored Sep 28, 2018
  
  68f30e0a
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · b6852629
  sherlock authored Sep 28, 2018
```
basicData module test and correct

See merge request root/atms!118
```
  b6852629
- fixed admin report config issue · 56feda01
  frank.xa.zhang authored Sep 28, 2018
  
  56feda01
- basicData module test and correct · 1d21d394
  sherlock authored Sep 28, 2018
  
  1d21d394
27 Sep, 2018 16 commits
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 6952e4a9
  neo.wang authored Sep 27, 2018
```
Dev oracle neo

See merge request root/atms!117
```
  6952e4a9
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 1b4f6905
  sherlock authored Sep 27, 2018
```
basicData module test and correct

See merge request root/atms!116
```
  1b4f6905
- add aop log · 5cb80ae3
  frank.xa.zhang authored Sep 27, 2018
  
  5cb80ae3
- [bug] fix project parameter for get all project · c3d319f6
  neo authored Sep 27, 2018
  
  c3d319f6
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 8ef76d85
  neo authored Sep 27, 2018
  
  8ef76d85
- Merge branch 'dev_oracle' into dev_oracle_frank · d3c9c6c5
  frank.xa.zhang authored Sep 27, 2018
  
  d3c9c6c5
- fixed backend issue · 77ca0e48
  frank.xa.zhang authored Sep 27, 2018
  
  77ca0e48
- fixed backend issue · e66d5cc3
  frank.xa.zhang authored Sep 27, 2018
  
  e66d5cc3
- fixed backend issue · 0c45a713
  frank.xa.zhang authored Sep 27, 2018
  
  0c45a713
- [dev] fix get projetc sql less where · eb4a077c
  neo authored Sep 27, 2018
  
  eb4a077c
- [dev] fix get project statsu sql · eb37fd2c
  neo authored Sep 27, 2018
  
  eb37fd2c
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 911b5ce8
  neo.wang authored Sep 27, 2018
```
Dev oracle neo

See merge request root/atms!115
```
  911b5ce8
- basicData module test and correct · 79e70f8e
  sherlock authored Sep 27, 2018
  
  79e70f8e
- [dev] fix project query list sql · 1a2cc057
  neo authored Sep 27, 2018
  
  1a2cc057
- [dev] add mistack for delete CorsFilter · a01e4498
  neo authored Sep 27, 2018
  
  a01e4498
- [dev] delete TB Journal finace Customs voucher Import Controller And Service · b0d55663
  neo authored Sep 27, 2018
  
  b0d55663
26 Sep, 2018 18 commits
- [dev] config vat sqlFactoroyTemplate The same with admin · 5011ee91
  neo authored Sep 26, 2018
  
  5011ee91
- [dev] delete un used FormularProjectMaper java file · dc080ab6
  neo authored Sep 26, 2018
  
  dc080ab6
- [dev] delete unused unit test and test used sql · 0ea4ca84
  neo authored Sep 26, 2018
  
  0ea4ca84
- [dev] delete unused json and sql and mail template · 8e94f868
  neo authored Sep 26, 2018
  
  8e94f868
- [dev] delete some unused java file · 8acff898
  neo authored Sep 26, 2018
  
  8acff898
- [dev] delete AopSharding databases · ccd54f84
  neo authored Sep 26, 2018
  
  ccd54f84
- [dev] delete Database Agent for create db · a8cecf99
  neo authored Sep 26, 2018
  
  a8cecf99
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 30419404
  neo.wang authored Sep 26, 2018
```
Dev oracle neo

See merge request root/atms!114
```
  30419404
- [dev] add My staticic attribuite xml · 0fa9fef2
  neo authored Sep 26, 2018
  
  0fa9fef2
- Merge branch 'dev_oracle' into dev_oracle_frank · c6d3e83a
  frank.xa.zhang authored Sep 26, 2018
```
# Conflicts:
#	atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java
```
  c6d3e83a
- [dev] hide query menu · ddde41ac
  neo authored Sep 26, 2018
  
  ddde41ac
- fixed db sql error · 2af46c23
  frank.xa.zhang authored Sep 26, 2018
  
  2af46c23
- [dev] hide query menu · b0daa393
  neo authored Sep 26, 2018
  
  b0daa393
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 748546bb
  neo.wang authored Sep 26, 2018
```
Dev oracle neo

See merge request root/atms!113
```
  748546bb
- [dev] hide menu for import data · f668fbd3
  neo authored Sep 26, 2018
  
  f668fbd3
- [dev] hide import menu · d74fd13d
  neo authored Sep 26, 2018
  
  d74fd13d
- [dev] hide menu about import data · 32f90781
  neo authored Sep 26, 2018
  
  32f90781
- [dev] fix html and js hide other menu · dab7e7e6
  neo authored Sep 26, 2018
  
  dab7e7e6