Commits · 378c4f120eb2f32c702f8d625a598222774becc7 · wangxiaoming / traffic-front

17 Nov, 2018 11 commits
- [Bugfix] fixed set formula block value · 378c4f12
  neo authored Nov 17, 2018
  
  378c4f12
- [Bugfix] fixed bb expression use bb not pct · 533b0353
  neo authored Nov 17, 2018
  
  533b0353
- [Bugfix] fixed BB isEmpt but shoudl use notEmpty · 75d1ddde
  neo authored Nov 17, 2018
  
  75d1ddde
- [DEV] fixed bb when cacls add manual · 2704734c
  neo authored Nov 17, 2018
  
  2704734c
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · d9177a0e
  sherlock authored Nov 17, 2018
```
Dev oracle sherlock

See merge request root/atms!195
```
  d9177a0e
- export order · 7f84730a
  sherlock authored Nov 17, 2018
  
  7f84730a
- export order · f515b68a
  sherlock authored Nov 17, 2018
  
  f515b68a
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 58d42ba0
  sherlock authored Nov 17, 2018
```
export order

See merge request root/atms!194
```
  58d42ba0
- export order · 14c0f1ab
  sherlock authored Nov 17, 2018
  
  14c0f1ab
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 8b0f05f8
  sherlock authored Nov 17, 2018
```
export bug

See merge request root/atms!193
```
  8b0f05f8
- export bug · d4723f8e
  sherlock authored Nov 17, 2018
  
  d4723f8e
16 Nov, 2018 11 commits
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 1ba5c631
  neo authored Nov 16, 2018
  
  1ba5c631
- [Bugfix] fixed bugs for status · a186fdaf
  neo authored Nov 16, 2018
  
  a186fdaf
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · d58f1203
  eddie.woo authored Nov 16, 2018
  
  d58f1203
- decimal format · 2c57c3e5
  eddie.woo authored Nov 16, 2018
  
  2c57c3e5
- [Bugfix] fixed confilict job the same time · 0c93b8e9
  neo authored Nov 16, 2018
  
  0c93b8e9
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 6026c0e1
  neo authored Nov 16, 2018
  
  6026c0e1
- [DEV] set status error postion · c05f0e54
  neo authored Nov 16, 2018
  
  c05f0e54
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · a5209be3
  sherlock authored Nov 16, 2018
```
允许手工数据源

See merge request root/atms!192
```
  a5209be3
- 允许手工数据源 · 7708296c
  sherlock authored Nov 16, 2018
  
  7708296c
- tb · c64c1e24
  eddie.woo authored Nov 16, 2018
  
  c64c1e24
- tb · 77bb7089
  eddie.woo authored Nov 16, 2018
  
  77bb7089
15 Nov, 2018 4 commits
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 20ca08a2
  eddie.woo authored Nov 15, 2018
  
  20ca08a2
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 61ebeb77
  sherlock authored Nov 15, 2018
```
输入手工数据

See merge request root/atms!191
```
  61ebeb77
- 输入手工数据 · 14b560ad
  sherlock authored Nov 15, 2018
  
  14b560ad
- modify · b099a0aa
  eddie.woo authored Nov 15, 2018
  
  b099a0aa
14 Nov, 2018 14 commits
- [Bugfix] cannot stop timer when updateconfig is error · 22f66510
  neo authored Nov 14, 2018
  
  22f66510
- [Bugfix] fixed batch copy config and use msg · bc10900c
  neo authored Nov 14, 2018
  
  bc10900c
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 70fe571d
  sherlock authored Nov 14, 2018
```
periodCellTemplate xml bug

See merge request root/atms!190
```
  70fe571d
- periodCellTemplate xml bug · 369a4194
  sherlock authored Nov 14, 2018
  
  369a4194
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 111b974e
  eddie.woo authored Nov 14, 2018
  
  111b974e
- [Bugfix] set error status · 94514f69
  neo authored Nov 14, 2018
  
  94514f69
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · e190e329
  eddie.woo authored Nov 14, 2018
  
  e190e329
- modify · d1200b74
  eddie.woo authored Nov 14, 2018
  
  d1200b74
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 0021438b
  sherlock authored Nov 14, 2018
```
Dev oracle sherlock

See merge request root/atms!189
```
  0021438b
- Merge branch 'dev_oracle' into 'dev_oracle_sherlock' · 121566c6
  sherlock authored Nov 14, 2018
```
# Conflicts:
#   atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
```
  121566c6
- modify · 5b4cc79a
  eddie.woo authored Nov 14, 2018
  
  5b4cc79a
- cell.getStringCellValue() · ff8cdc20
  sherlock authored Nov 14, 2018
  
  ff8cdc20
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · d8e5872d
  eddie.woo authored Nov 14, 2018
  
  d8e5872d
- modify · 3ab39e95
  eddie.woo authored Nov 14, 2018
  
  3ab39e95