Commits · 444ed5a10a98c4f815a263217ddbe1e3801498c6 · wangxiaoming / traffic-front

02 Jul, 2018 4 commits
- Merge branch 'dev' into dev_frank · 444ed5a1
  frank.xa.zhang authored Jul 02, 2018
  
  444ed5a1
- add new api voucherSelectAdvancedByVoucher · b8995e16
  frank.xa.zhang authored Jul 02, 2018
  
  b8995e16
- Merge branch 'dev_neo' into 'dev' · 416ad1c6
  neo.wang authored Jul 02, 2018
```
[DEV] fixed template group self defind sql

See merge request root/atms!43
```
  416ad1c6
- [DEV] fixed template group self defind sql · 940f57c3
  neo authored Jul 02, 2018
  
  940f57c3
28 Jun, 2018 4 commits
- Merge branch 'dev_neo' into 'dev' · acfd3c60
  neo.wang authored Jun 28, 2018
```
[bug] fixed dbname is wrong for porject add

See merge request root/atms!42
```
  acfd3c60
- [bug] fixed dbname is wrong for porject add · 63108bf2
  neo authored Jun 28, 2018
  
  63108bf2
- Merge branch 'dev_neo' into 'dev' · 786b99a7
  neo.wang authored Jun 28, 2018
```
Dev neo

See merge request root/atms!40
```
  786b99a7
- [BUG] bug fiex db cannot creat when add project · f31033d6
  neo authored Jun 28, 2018
  
  f31033d6
26 Jun, 2018 1 commit
- [DEV] deltete CompanyBalanceDto and reference · 69146937
  neo authored Jun 26, 2018
  
  69146937
25 Jun, 2018 15 commits
- Merge branch 'dev_neo' into 'dev' · 56492875
  neo.wang authored Jun 25, 2018
```
Dev neo

See merge request root/atms!39
```
  56492875
- [DEV] getCustomsInvoicesValidates impl · 068a0753
  neo authored Jun 25, 2018
  
  068a0753
- Merge branch 'dev' into dev_frank · ba172580
  frank.xa.zhang authored Jun 25, 2018
  
  ba172580
- [fixed issue] report config renew with new table · 5b968322
  frank.xa.zhang authored Jun 25, 2018
  
  5b968322
- [DEV] input invoice get item impl · 0bf47e57
  neo authored Jun 25, 2018
  
  0bf47e57
- Merge branch 'dev_neo' into 'dev' · cb8c7d2f
  neo.wang authored Jun 25, 2018
```
[DEV] output vat invoice getlist impl

See merge request root/atms!38
```
  cb8c7d2f
- [DEV] output vat invoice getlist impl · d9a990d2
  neo authored Jun 25, 2018
  
  d9a990d2
- Merge branch 'dev_neo' into 'dev' · 70e85bf1
  neo.wang authored Jun 25, 2018
```
[DEV] re build voucher mapper

See merge request root/atms!37
```
  70e85bf1
- [DEV] re build voucher mapper · 2ec9521c
  neo authored Jun 25, 2018
  
  2ec9521c
- Merge remote-tracking branch 'origin/dev' into dev · 707b9abc
  frank.xa.zhang authored Jun 25, 2018
  
  707b9abc
- Merge branch 'dev_neo' into 'dev' · 99301a45
  neo.wang authored Jun 25, 2018
```
[DEV] project query db filed fixed

See merge request root/atms!36
```
  99301a45
- Merge branch 'dev' into dev_frank · 91b2449a
  frank.xa.zhang authored Jun 25, 2018
  
  91b2449a
- [DEV] project query db filed fixed · 9cbf3400
  neo authored Jun 25, 2018
  
  9cbf3400
- [data migration] migration data from old table to new table · e1f4c3ea
  frank.xa.zhang authored Jun 25, 2018
  
  e1f4c3ea
- [data migration] migration data from old table to new table · adb71540
  frank.xa.zhang authored Jun 25, 2018
  
  adb71540
23 Jun, 2018 1 commit
- [fixed issue] change the database to new style · c7939ead
  frank.xa.zhang authored Jun 23, 2018
  
  c7939ead
22 Jun, 2018 15 commits
- change the database to new style · ef2478a6
  frank.xa.zhang authored Jun 22, 2018
  
  ef2478a6
- change the database to new style · 24dfa264
  frank.xa.zhang authored Jun 22, 2018
  
  24dfa264
- Merge branch 'dev_neo' into 'dev' · 4dff5e25
  neo.wang authored Jun 22, 2018
```
[DEV] ] query Invoice Voucher mapping

See merge request root/atms!35
```
  4dff5e25
- [DEV] ] query Invoice Voucher mapping · e99a0db2
  neo authored Jun 22, 2018
  
  e99a0db2
- save id generator locally · 418a6c80
  frank.xa.zhang authored Jun 22, 2018
  
  418a6c80
- save id generator locally · e4a54c9b
  frank.xa.zhang authored Jun 22, 2018
  
  e4a54c9b
- Merge branch 'dev' into dev_frank · 87e5ed17
  frank.xa.zhang authored Jun 22, 2018
  
  87e5ed17
- Merge branch 'dev_neo' into 'dev' · 86d4e745
  neo.wang authored Jun 22, 2018
```
Dev neo

See merge request root/atms!34
```
  86d4e745
- [DEV] add converter temp file · 2473dbeb
  neo authored Jun 22, 2018
  
  2473dbeb
- [DEV] add custom service · 2b05f439
  neo authored Jun 22, 2018
  
  2b05f439
- Merge branch 'dev' into dev_frank · f02fc7a3
  frank.xa.zhang authored Jun 22, 2018
  
  f02fc7a3
- Merge branch 'dev_neo2' into 'dev' · f7d31266
  neo.wang authored Jun 22, 2018
```
[DEV] project new table sql define

See merge request root/atms!33
```
  f7d31266
- [DEV] project new table sql define · 2c2e9b29
  neo authored Jun 22, 2018
  
  2c2e9b29
- POI test file · 3c25556f
  frank.xa.zhang authored Jun 22, 2018
  
  3c25556f
- Merge branch 'dev_neo2' into 'dev' · 2e01a40d
  neo.wang authored Jun 22, 2018
```
Dev neo2

See merge request root/atms!30
```
  2e01a40d