Commits · 10a6241fe8abf5d2e9956bd7082ca3c06f2f4651 · wangxiaoming / traffic-front

31 Oct, 2018 1 commit
- bug:app-overview:listView\cardView · 10a6241f
  sherlock authored Oct 31, 2018
  
  10a6241f
30 Oct, 2018 7 commits
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms… · 89ba4278
  sherlock authored Oct 30, 2018
```
Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle_sherlock
```
  89ba4278
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · b9f9ad4f
  sherlock authored Oct 30, 2018
  
  b9f9ad4f
- [bugfix] fixed template config with blan sring for formular · 65c15d9a
  neo authored Oct 30, 2018
  
  65c15d9a
- [bugfix] fixed temp batch inster triem blank string · 762c7f77
  neo authored Oct 30, 2018
  
  762c7f77
- [Bugfix] use dpo not dto tempGroupDto mapper · 79879fa2
  neo authored Oct 30, 2018
  
  79879fa2
- [Bugfix] fixe rename template and save with mapper inbound · fd105619
  neo authored Oct 30, 2018
  
  fd105619
- [dev] add approval edite page · 9a3ea8c7
  neo authored Oct 30, 2018
  
  9a3ea8c7
29 Oct, 2018 7 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 40d7f80b
  sherlock authored Oct 29, 2018
```
Dev oracle sherlock

See merge request root/atms!162
```
  40d7f80b
- bug:19303\19295\ · 20e3dc57
  sherlock authored Oct 29, 2018
  
  20e3dc57
- [DEV] add log for exception · ee6f7988
  neo authored Oct 29, 2018
  
  ee6f7988
- Revert "[Bugfix] fixed save formular cannot save to db" · 6547493e
  neo authored Oct 29, 2018
```
This reverts commit 3acb4e28.
```
  6547493e
- [Bugfix] fixed save formular cannot save to db · 3acb4e28
  neo authored Oct 29, 2018
  
  3acb4e28
- [dev] bb approval liu cheng tu · 4dadd9a8
  neo authored Oct 29, 2018
  
  4dadd9a8
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 3907a401
  neo.wang authored Oct 29, 2018
```
[dev] fixed uigrid to dxgrid and view active menu

See merge request root/atms!161
```
  3907a401
26 Oct, 2018 7 commits
- [dev] fixed uigrid to dxgrid and view active menu · c6d19c3a
  neo authored Oct 26, 2018
  
  c6d19c3a
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · 27c27c2a
  sherlock authored Oct 26, 2018
  
  27c27c2a
- ojdbc12 · e30ecb81
  sherlock authored Oct 26, 2018
  
  e30ecb81
- modify · 7854f666
  eddie.woo authored Oct 26, 2018
  
  7854f666
- modify · ebacc1bd
  eddie.woo authored Oct 26, 2018
  
  ebacc1bd
- [dev] revert apply app module part js · 7bc96dd8
  neo authored Oct 26, 2018
  
  7bc96dd8
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 22d5f56c
  sherlock authored Oct 26, 2018
```
areaName and businessUnitName

See merge request root/atms!160
```
  22d5f56c
25 Oct, 2018 18 commits
- bug:app-overview:listView\cardView · 920fb4d3
  sherlock authored Oct 25, 2018
  
  920fb4d3
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · 0208fca6
  sherlock authored Oct 25, 2018
```
# Conflicts:
#	atms-web/src/main/webapp/bundles/infrastructure.js
```
  0208fca6
- bug:app-overview:listView\cardView · 6a1f0dae
  sherlock authored Oct 25, 2018
  
  6a1f0dae
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 7aaf0076
  eddie.woo authored Oct 25, 2018
  
  7aaf0076
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 6de77904
  neo authored Oct 25, 2018
  
  6de77904
- [bugfix] fix approval time formart date · 49307641
  neo authored Oct 25, 2018
  
  49307641
- modify · 0d95b3da
  eddie.woo authored Oct 25, 2018
  
  0d95b3da
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 6ece16d6
  neo.wang authored Oct 25, 2018
```
Dev oracle neo

See merge request root/atms!157
```
  6ece16d6
- [dev] fix createBy date formart · 4cc56881
  neo authored Oct 25, 2018
  
  4cc56881
- [dev] impl query approval task info · e87879df
  neo authored Oct 25, 2018
  
  e87879df
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 91ba9c17
  neo.wang authored Oct 25, 2018
```
[dev] fixed approval task page grid item

See merge request root/atms!156
```
  91ba9c17
- [dev] fixed approval task page grid item · 65fbd567
  neo authored Oct 25, 2018
  
  65fbd567
- revert junit · 4d9bda71
  eddie.woo authored Oct 25, 2018
  
  4d9bda71
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 21286999
  sherlock authored Oct 25, 2018
```
vat-organization-structure span float

See merge request root/atms!155
```
  21286999
- bug:app-overview:listView\cardView · f1bd5974
  sherlock authored Oct 25, 2018
  
  f1bd5974
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 58b9b346
  neo.wang authored Oct 25, 2018
```
Dev oracle neo

See merge request root/atms!154
```
  58b9b346
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 8c31c17d
  neo authored Oct 25, 2018
  
  8c31c17d
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 39746550
  neo.wang authored Oct 25, 2018
```
Dev oracle neo

See merge request root/atms!153
```
  39746550