Commits · 4f1f9b6f359c2a5678b7f75becb3841533ddedfe · wangxiaoming / traffic-front

10 Sep, 2018 7 commits
- [dev] gen oracle create table script · 4f1f9b6f
  neo authored Aug 22, 2018
  
  4f1f9b6f
- [dev] use jpa gen common project table for mysql and oracle · 8e711ff1
  neo authored Aug 21, 2018
  
  8e711ff1
- [dev] add spring default and mysql support · 8132c1ea
  neo authored Aug 21, 2018
  
  8132c1ea
- [dev] change some tablename and filedname for oracle length limit30 and add… · e0be0f9e
  neo authored Aug 20, 2018
```
[dev] change some tablename and filedname for oracle length limit30 and add cloumdefault value for number and string
```
  e0be0f9e
- [init] use spring jpa create table · 78e1b7be
  neo authored Aug 17, 2018
  
  78e1b7be
- [bugfix] delete spring boot parent · c71b2339
  neo authored Aug 14, 2018
  
  c71b2339
- [dev] atms add multimoduel surpport · c547c5c9
  neo authored Aug 14, 2018
  
  c547c5c9
04 Sep, 2018 10 commits
- Merge branch 'dev' into dev_frank · 9b7f8487
  frank.xa.zhang authored Sep 04, 2018
```
# Conflicts:
#	atms-web/src/main/webapp/app/common/controls/vat-report-sheet/vat-report-sheet.js
#	atms-web/src/main/webapp/bundles/common.js
```
  9b7f8487
- Merge branch 'dev_neo3' into 'dev' · 8d097bf0
  neo.wang authored Sep 04, 2018
```
Dev neo3

See merge request root/atms!108
```
  8d097bf0
- [bugfix] add double ds item for current perido bb · 73129237
  neo authored Sep 04, 2018
  
  73129237
- fixed jxfp didn't have formula_block data · d32f8f52
  frank.xa.zhang authored Sep 04, 2018
  
  d32f8f52
- [bugfix] bb formula save double datasource item · ad2f589b
  neo authored Sep 04, 2018
  
  ad2f589b
- [bugfix] un used underline template · 3d06b96c
  neo authored Sep 04, 2018
  
  3d06b96c
- [bugfix] bb formular ds item cast exception · 1ad32dde
  neo authored Sep 04, 2018
  
  1ad32dde
- [dev] use single bb ds item · a8ab749c
  neo authored Sep 04, 2018
  
  a8ab749c
- Merge branch 'dev_neo3' into 'dev' · c022969c
  neo.wang authored Sep 04, 2018
```
[revert] revert change bb item to single ds

See merge request root/atms!107
```
  c022969c
- [revert] revert change bb item to single ds · c964b9f4
  neo authored Sep 04, 2018
  
  c964b9f4
03 Sep, 2018 18 commits
- Merge branch 'dev_neo3' into 'dev' · 7bf9f064
  neo.wang authored Sep 03, 2018
```
Dev neo3

See merge request root/atms!106
```
  7bf9f064
- [merge] merge confilict · a9d15003
  neo authored Sep 03, 2018
  
  a9d15003
- [bugfix] add type field to report cell data dto · 5ee3f338
  neo authored Sep 03, 2018
  
  5ee3f338
- [dev] add setter annotiation for reportcell datadto · ea71a55e
  neo authored Sep 03, 2018
  
  ea71a55e
- fixed keyvalue formula paresed issue · e3f2030c
  frank.xa.zhang authored Sep 03, 2018
  
  e3f2030c
- [dev] bb multi data source item to data source · 1058cc56
  neo authored Sep 03, 2018
  
  1058cc56
- [dev] fixed data source detail for bb current priod · 1d909abd
  neo authored Sep 03, 2018
  
  1d909abd
- Merge branch 'dev' into dev_frank · 10871ac9
  frank.xa.zhang authored Sep 03, 2018
  
  10871ac9
- add null condition · fab92652
  frank.xa.zhang authored Sep 03, 2018
  
  fab92652
- Merge branch 'dev_neo3' into 'dev' · 3d3e89cc
  neo.wang authored Sep 03, 2018
```
[bugfix] null point when bb reference a mual cell

See merge request root/atms!104
```
  3d3e89cc
- [bugfix] null point when bb reference a mual cell · 12497fd3
  neo authored Sep 03, 2018
  
  12497fd3
- Merge branch 'dev' into dev_frank · cc959a2e
  frank.xa.zhang authored Sep 03, 2018
  
  cc959a2e
- fixed #VALUE! error · dc6f7767
  frank.xa.zhang authored Sep 03, 2018
  
  dc6f7767
- Merge branch 'dev_neo3' into 'dev' · 2c4b4601
  neo.wang authored Sep 03, 2018
```
Dev neo3

See merge request root/atms!103
```
  2c4b4601
- [bugfix] delete unused formula filed in CellTemplateDto · 44e9ea72
  neo authored Sep 03, 2018
  
  44e9ea72
- [dev] do not use config type to filter cell template per group · 03912942
  neo authored Sep 03, 2018
  
  03912942
- [dev] set pct data bigDicimal 0 where get a invlalid value · 1c0d7ab7
  neo authored Sep 03, 2018
  
  1c0d7ab7
- Merge branch 'dev_neo3' into 'dev' · d66688cf
  neo.wang authored Sep 03, 2018
```
Dev neo3

See merge request root/atms!102
```
  d66688cf
31 Aug, 2018 5 commits
- sort the menu of the report · b5fbbe27
  frank.xa.zhang authored Aug 31, 2018
  
  b5fbbe27
- [bugfix] if not found celltemplate use default formula block · ec87c252
  neo authored Aug 31, 2018
  
  ec87c252
- [bugfix] bb if not found pct default is 0 · 5e6682b7
  neo authored Aug 31, 2018
  
  5e6682b7
- [bugfix] cell template and template config must use period refer but not used · 8abcd7eb
  neo authored Aug 31, 2018
  
  8abcd7eb
- [bugfix] current period rowindex is wrong used clomnindex · abd75467
  neo authored Aug 31, 2018
  
  abd75467