Commits · 8541823a121a58dbe699ff609c6b40537381238f · wangxiaoming / traffic-front

05 Nov, 2018 12 commits
- [Bugfix] fixed bb else is wrong positon · 8541823a
  neo authored Nov 05, 2018
  
  8541823a
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · d10dc4f0
  neo authored Nov 05, 2018
  
  d10dc4f0
- [Bugfix] fixed bb conbert double value when errorEval · 52b04315
  neo authored Nov 05, 2018
  
  52b04315
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · bb5b86e7
  sherlock authored Nov 05, 2018
```
bug:19213\纳税申报表排序\preview 优化

See merge request root/atms!172
```
  bb5b86e7
- [Bugfix] add log for bb not find report code · fd70f77e
  neo authored Nov 05, 2018
  
  fd70f77e
- bug:19213\纳税申报表排序\preview 优化 · 34e82a7f
  sherlock authored Nov 05, 2018
  
  34e82a7f
- [Bugfix] fixed only copy template where is active · 06cd3b39
  neo authored Nov 05, 2018
  
  06cd3b39
- [Bugfix] fixed celltemplate config may be empty where batch insert · 2605ea45
  neo authored Nov 05, 2018
  
  2605ea45
- [Bugfix] fixed templateid not use int copy celltemplate and config · 156161c9
  neo authored Nov 05, 2018
  
  156161c9
- [Bugfix] fixed missed ; and can not compile · 5009435f
  neo authored Nov 05, 2018
  
  5009435f
- [DEV] split mualt select to singel select · f3d2ceac
  neo authored Nov 05, 2018
  
  f3d2ceac
- [DEV] fixed maven dependence for gcexecl · b422bd93
  Your Name authored Nov 05, 2018
  
  b422bd93
02 Nov, 2018 14 commits
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 5d365403
  neo authored Nov 02, 2018
  
  5d365403
- [dev] bugfix and download report sheet impl · f6e2174c
  neo authored Nov 02, 2018
  
  f6e2174c
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 96dbe8ac
  sherlock authored Nov 02, 2018
```
Dev oracle sherlock

See merge request root/atms!171
```
  96dbe8ac
- bug:19216 · 52408455
  sherlock authored Nov 02, 2018
  
  52408455
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · e48d186a
  sherlock authored Nov 02, 2018
  
  e48d186a
- Merge remote-tracking branch 'origin/dev_oracle_sherlock' into dev_oracle_sherlock · 7bdb2138
  sherlock authored Nov 02, 2018
  
  7bdb2138
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 5f760aa4
  sherlock authored Nov 02, 2018
```
xxfp bug

See merge request root/atms!170
```
  5f760aa4
- Merge branch 'dev_oracle' into 'dev_oracle_sherlock' · a957930f
  sherlock authored Nov 02, 2018
```
# Conflicts:
#   atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
```
  a957930f
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · accba4a0
  sherlock authored Nov 02, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
```
  accba4a0
- xxfp bug · 4116029a
  sherlock authored Nov 02, 2018
  
  4116029a
- [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 14 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