Commits · 30bfbfc17660740924a57672805d265f919cfae8 · wangxiaoming / traffic-front

01 Nov, 2018 1 commit
- [Bug 19426] fixed bug cannot delete templete group · 30bfbfc1
  neo authored Nov 01, 2018
  
  30bfbfc1
31 Oct, 2018 20 commits
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 4b6261c3
  neo authored Oct 31, 2018
  
  4b6261c3
- [Bugfix] fix report gen mult result · 32194cc2
  neo authored Oct 31, 2018
  
  32194cc2
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · be5e822f
  sherlock authored Oct 31, 2018
```
Dev oracle sherlock

See merge request root/atms!164
```
  be5e822f
- bug:app-overview:listView\cardView · 615e097c
  sherlock authored Oct 31, 2018
  
  615e097c
- bug:app-overview:listView\cardView · 071425ed
  sherlock authored Oct 31, 2018
  
  071425ed
- [BugFix] fixed mapper retrun type not mapping in period data source M · 70012bb6
  neo authored Oct 31, 2018
  
  70012bb6
- [BugFix] fixed select period datasource errro · 18124cd8
  neo authored Oct 31, 2018
  
  18124cd8
- [Bugfix] fixed bugx for project id for insert period data sources · 74d13e98
  neo authored Oct 31, 2018
  
  74d13e98
- [Bugfix] revert formual revert default value fixed null db field instead · 7e2e0243
  neo authored Oct 31, 2018
  
  7e2e0243
- [BugFix] fixed maual formual default keyvalueid · a02bcbd6
  neo authored Oct 31, 2018
  
  a02bcbd6
- [Bugfix] fixed report manal datasorce empty value with default value · 13712764
  neo authored Oct 31, 2018
  
  13712764
- [BugFix] fixed formual datasource key value id empty string · 0f261cb2
  neo authored Oct 31, 2018
  
  0f261cb2
- [Bugfix] fixed formual datasource name wiht empty string when null · f749c4a4
  neo authored Oct 31, 2018
  
  f749c4a4
- [bugfix] fixed manual formual sql error miss and befor rownum · 53ff5701
  neo authored Oct 31, 2018
  
  53ff5701
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · c89864c9
  neo authored Oct 31, 2018
  
  c89864c9
- [bugfix] fix manual formual sql limit to rownum · a8e93415
  neo authored Oct 31, 2018
  
  a8e93415
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · d320d29b
  sherlock authored Oct 31, 2018
```
Dev oracle sherlock

See merge request root/atms!163
```
  d320d29b
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · 9381f831
  sherlock authored Oct 31, 2018
  
  9381f831
- bug:app-overview:listView\cardView · 10a6241f
  sherlock authored Oct 31, 2018
  
  10a6241f
- [bugfix] fixed manual formual not work fine · 9dbb14aa
  neo authored Oct 31, 2018
  
  9dbb14aa
30 Oct, 2018 9 commits
- [bugfix] fixed for i outindex sheet count · bb517b5d
  neo authored Oct 30, 2018
  
  bb517b5d
- [bugfix] fix import excel big bug · 84d54351
  neo authored Oct 30, 2018
  
  84d54351
- 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 3 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