Commits · b29bb3c9a3189bd1986b188aa8821629ac0992fd · wangxiaoming / traffic-front

27 Nov, 2018 16 commits
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · b29bb3c9
  eddie.woo authored Nov 27, 2018
  
  b29bb3c9
- modify · 00839ba3
  eddie.woo authored Nov 27, 2018
  
  00839ba3
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · e8bc7bfa
  sherlock authored Nov 27, 2018
```
dffs\jffs\gl export number format

See merge request root/atms!212
```
  e8bc7bfa
- dffs\jffs\gl export number format · 5358de9d
  sherlock authored Nov 27, 2018
  
  5358de9d
- [DEV] fixed approval skip null tempGroupId · 6421b091
  neo authored Nov 27, 2018
  
  6421b091
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · b9d9d047
  sherlock authored Nov 27, 2018
```
报表排序拆分

See merge request root/atms!211
```
  b9d9d047
- 报表排序拆分 · 39d3f2b6
  sherlock authored Nov 27, 2018
  
  39d3f2b6
- [BugFixe] fixed period report join tempate · d86323f8
  neo authored Nov 27, 2018
  
  d86323f8
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 836bf1e1
  neo authored Nov 27, 2018
  
  836bf1e1
- [BugFixed] fixed approval result undefind · 55ad30f3
  neo authored Nov 27, 2018
  
  55ad30f3
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 7a144c21
  sherlock authored Nov 27, 2018
```
Dev oracle sherlock

See merge request root/atms!210
```
  7a144c21
- dffs\jffs\gl export number format · cba35824
  sherlock authored Nov 27, 2018
  
  cba35824
- modify · 79b3576e
  eddie.woo authored Nov 27, 2018
  
  79b3576e
- modify · c6a1e283
  eddie.woo authored Nov 27, 2018
  
  c6a1e283
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 89cee29d
  eddie.woo authored Nov 27, 2018
  
  89cee29d
- modify · 6044f0ef
  eddie.woo authored Nov 27, 2018
  
  6044f0ef
26 Nov, 2018 13 commits
- [DEV] fixed some bugs · 3c5011e2
  neo authored Nov 26, 2018
  
  3c5011e2
- [DEV] fixed check task bugs · b1bbd3ee
  neo authored Nov 26, 2018
  
  b1bbd3ee
- [DEV] fixed ID to id for org permission key dto · d4e1bdec
  neo authored Nov 26, 2018
  
  d4e1bdec
- [DEV] add org id in approval task info · b6a97d46
  neo authored Nov 26, 2018
  
  b6a97d46
- 数据预览分页问题 · 084a8af0
  sherlock authored Nov 26, 2018
  
  084a8af0
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 163acc9d
  neo authored Nov 26, 2018
  
  163acc9d
- [Bugfix] fixed approval all and use page permission · 767045f8
  neo authored Nov 26, 2018
  
  767045f8
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 655f5bc0
  sherlock authored Nov 26, 2018
```
Dev oracle sherlock

See merge request root/atms!209
```
  655f5bc0
- dffs org filter · cd32138b
  sherlock authored Nov 26, 2018
  
  cd32138b
- [Bugfix] do not use ID use id · 4839a91e
  neo authored Nov 26, 2018
  
  4839a91e
- [DEV] fixed all id can not set in dto · 72e3ce04
  neo authored Nov 26, 2018
  
  72e3ce04
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · d0a31158
  neo authored Nov 26, 2018
  
  d0a31158
- count total, templateName · f74c5e27
  sherlock authored Nov 26, 2018
  
  f74c5e27
23 Nov, 2018 5 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 65bfaff9
  sherlock authored Nov 23, 2018
```
dffs\jffs\gl export number format

See merge request root/atms!208
```
  65bfaff9
- dffs\jffs\gl export number format · 09412b34
  sherlock authored Nov 23, 2018
  
  09412b34
- [Bugfix] fixed approval assert · 12df33d8
  neo authored Nov 23, 2018
  
  12df33d8
- [DEV] fixed approval with period and porject · 44a8b78e
  neo authored Nov 23, 2018
  
  44a8b78e
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · def95670
  neo.wang authored Nov 23, 2018
```
Dev oracle neo

See merge request root/atms!207
```
  def95670
22 Nov, 2018 6 commits
- [DEV] fixed report update time · 7e7b44b1
  neo authored Nov 22, 2018
  
  7e7b44b1
- [DEV] rename ProjectContext to PC formula · 9ab00ee7
  neo authored Nov 22, 2018
  
  9ab00ee7
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · a07dcfd0
  eddie.woo authored Nov 22, 2018
  
  a07dcfd0
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · ebf3c7d4
  sherlock authored Nov 22, 2018
```
JXFP data transfer

See merge request root/atms!206
```
  ebf3c7d4
- [DEV] hidden keyword datasorce menu in admin · 4ef6fc28
  neo authored Nov 22, 2018
  
  4ef6fc28
- JXFP data transfer · effb3cfe
  sherlock authored Nov 22, 2018
  
  effb3cfe