Commits · 26c6c131576315a8b1cffd7a96b67dca3670daf3 · wangxiaoming / traffic-front

02 Nov, 2018 4 commits
- [Bugfix] fixed isProjectStatsuExist paramerter error · 26c6c131
  neo authored Nov 02, 2018
  
  26c6c131
- [BugFix] fixed project change period and upate status · 0da6a1e8
  neo authored Nov 02, 2018
  
  0da6a1e8
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 07b1cbc1
  sherlock authored Nov 02, 2018
```
xxfp\去掉导出按钮

See merge request root/atms!169
```
  07b1cbc1
- xxfp\去掉导出按钮 · d978f2c9
  sherlock authored Nov 02, 2018
  
  d978f2c9
01 Nov, 2018 20 commits
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 7ba95455
  neo.wang authored Nov 01, 2018
```
Dev oracle neo

See merge request root/atms!168
```
  7ba95455
- [Bugfix] fixed sql error for maunal query · a32ca02b
  neo authored Nov 01, 2018
  
  a32ca02b
- [Bugfix] fixed js qout misss · d154a365
  neo authored Nov 01, 2018
  
  d154a365
- [DEV] add comfire for munal datasrource for re gen report · 1e994fc1
  neo authored Nov 01, 2018
  
  1e994fc1
- [DEV] delete period data source with merger maual not correct · 0aedfa54
  neo authored Nov 01, 2018
  
  0aedfa54
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 2fd1fa9c
  sherlock authored Nov 01, 2018
```
Dev oracle sherlock

See merge request root/atms!167
```
  2fd1fa9c
- 金额、税额 to right · c0d2b961
  sherlock authored Nov 01, 2018
  
  c0d2b961
- bug:app-overview:listView\cardView · cd196bc9
  sherlock authored Nov 01, 2018
  
  cd196bc9
- [Bugfix] fixed muallempty id sql errro · 6b46f9ad
  neo authored Nov 01, 2018
  
  6b46f9ad
- [dev] do not delete maunual data · 7a473ec4
  neo authored Nov 01, 2018
  
  7a473ec4
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 6cb74496
  neo authored Nov 01, 2018
  
  6cb74496
- [Bugfix] fixed data source project id is null · deee1db2
  neo authored Nov 01, 2018
  
  deee1db2
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 0f9061b2
  sherlock authored Nov 01, 2018
```
Dev oracle sherlock

See merge request root/atms!166
```
  0f9061b2
- bug:app-overview:listView\cardView · ca6e0446
  sherlock authored Nov 01, 2018
  
  ca6e0446
- [Bugfix] fixed save template group · 2e936d03
  neo authored Nov 01, 2018
  
  2e936d03
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 52786c0a
  neo.wang authored Nov 01, 2018
```
Dev oracle neo

See merge request root/atms!165
```
  52786c0a
- [BugFix] fixed bb formulate cannot xianshi · 961aa756
  neo authored Nov 01, 2018
  
  961aa756
- [bugfix] fixed nullpoint for bb formular · 4ceb93c1
  neo authored Nov 01, 2018
  
  4ceb93c1
- bug:19445 · 93edd535
  sherlock authored Nov 01, 2018
  
  93edd535
- [Bug 19426] fixed bug cannot delete templete group · 30bfbfc1
  neo authored Nov 01, 2018
  
  30bfbfc1
31 Oct, 2018 16 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