Commits · 8a8d1985c736b643cfa7800598c6d863a6f40367 · wangxiaoming / traffic-front

12 Sep, 2018 7 commits
- [dev] drop admin jpa entity · 8a8d1985
  neo authored Sep 12, 2018
  
  8a8d1985
- Merge branch 'dev_oracle' into 'dev' · ef68702d
  neo.wang authored Sep 12, 2018
```
Dev oracle

See merge request root/atms!110
```
  ef68702d
- [dev] rename entitiy to entity for admin package · c2b7e4f4
  neo authored Sep 12, 2018
  
  c2b7e4f4
- [dev] drop admin jpa entity no used · 50645f68
  neo authored Sep 12, 2018
  
  50645f68
- [dev] gen gernerator xml impl · 306f56c8
  neo authored Sep 12, 2018
  
  306f56c8
- [dev] add generator oracle properties and xml · 218e750c
  neo authored Sep 12, 2018
  
  218e750c
- [dev] tongyi entity java type · f52aac1c
  neo authored Sep 12, 2018
  
  f52aac1c
11 Sep, 2018 10 commits
- Merge branch 'dev_oracle' into 'dev' · 46b0c129
  neo.wang authored Sep 11, 2018
```
Dev oracle

See merge request root/atms!109
```
  46b0c129
- [bugfix] fixed the same dpo used in mapper and ervice · a7b3ae38
  neo authored Sep 11, 2018
  
  a7b3ae38
- [bugfix] fixed dto used in xml not the same dop in mapper · 97041c5b
  neo authored Sep 11, 2018
  
  97041c5b
- [bugfix] add dop to mapper reference · 16a7951b
  neo authored Sep 11, 2018
  
  16a7951b
- [dev] config mapper location · 1e61727d
  neo authored Sep 11, 2018
  
  1e61727d
- [dev] re generate mysql mapper xml · 19312c5d
  neo authored Sep 11, 2018
  
  19312c5d
- [dev] split user definde xml sql and mybaties gen xml · 239e789a
  neo authored Sep 11, 2018
  
  239e789a
- [dev] fixed dao module to jar package · 3f3d0cff
  neo authored Sep 11, 2018
  
  3f3d0cff
- [dev] add atms-dao to atms child module · eecea159
  neo authored Sep 11, 2018
  
  eecea159
- [dev] splite mybaties gen mapper and entity to module · 490ba6e0
  neo authored Sep 11, 2018
  
  490ba6e0
10 Sep, 2018 11 commits
- [dev] rename package · af456e17
  neo authored Sep 10, 2018
  
  af456e17
- [dev] gen oracle talble column is order by entity filed · 07ed94ec
  neo authored Sep 10, 2018
  
  07ed94ec
- [dev] reduce cloumn name and table name is too long for oracle · 1e162c01
  neo authored Sep 06, 2018
  
  1e162c01
- [dev] replace table and cloumn name · 6c0cde7f
  neo authored Sep 06, 2018
  
  6c0cde7f
- [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 2 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