Commits · 86d4e745dbe184c6230a562f7fe65c29dbf83a42 · wangxiaoming / traffic-front

22 Jun, 2018 8 commits
- 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_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
- Merge branch 'dev_neo2' into 'dev' · 2e01a40d
  neo.wang authored Jun 22, 2018
```
Dev neo2

See merge request root/atms!30
```
  2e01a40d
- [DEV] change commont excetion to one package · 5e886e22
  neo authored Jun 22, 2018
  
  5e886e22
- [DEV] make workflow http request can not ask · a368d36d
  neo authored Jun 22, 2018
  
  a368d36d
21 Jun, 2018 5 commits
- Merge branch 'dev_neo2' into 'dev' · b673e6d8
  neo.wang authored Jun 21, 2018
```
Dev neo2

See merge request root/atms!29
```
  b673e6d8
- [BUGFIX] mybaties gen can deal keyword and userid for insert peroidinfo · 5b63aecb
  neo authored Jun 21, 2018
  
  5b63aecb
- [BUGFIX] null for periodid and mysql keyword for cloum name · d3164547
  neo authored Jun 21, 2018
  
  d3164547
- [DEV] outputInvoiceImport getEvidenceList impl · 7ec11571
  neo authored Jun 21, 2018
  
  7ec11571
- [dev] financeImportData datacheck impl · 6a18d012
  neo authored Jun 21, 2018
  
  6a18d012
20 Jun, 2018 6 commits
- Merge branch 'dev_neo2' into 'dev' · 7baee921
  neo.wang authored Jun 20, 2018
```
Dev neo2

See merge request root/atms!28
```
  7baee921
- [DEV] journal entry validation · b9b317ba
  neo authored Jun 20, 2018
  
  b9b317ba
- [DEV] add getProjectImportType impl · a33d964a
  neo authored Jun 20, 2018
  
  a33d964a
- Merge branch 'dev_neo2' into 'dev' · cebaf261
  neo.wang authored Jun 20, 2018
```
Dev neo2

See merge request root/atms!27
```
  cebaf261
- [DEV] add local jetty run to run fast · 28054c7d
  neo authored Jun 20, 2018
  
  28054c7d
- [DEV] serios data import query · 73da29b8
  neo authored Jun 20, 2018
  
  73da29b8
19 Jun, 2018 8 commits
- Merge branch 'dev_neo2' into 'dev' · 51821c29
  neo.wang authored Jun 19, 2018
```
[DEV] get file content upload file

See merge request root/atms!26
```
  51821c29
- [DEV] get file content upload file · 2e04d14f
  neo authored Jun 19, 2018
  
  2e04d14f
- Merge branch 'dev_neo2' into 'dev' · 00e5666c
  neo.wang authored Jun 19, 2018
```
Dev neo2

See merge request root/atms!25
```
  00e5666c
- [DEV] 文] file upload bug fixed · f7d943cd
  neo authored Jun 19, 2018
  
  f7d943cd
- [DEV] write http inputstrem to tempfile output stream · abd6fffd
  neo authored Jun 19, 2018
  
  abd6fffd
- [DEV] return upload result · e64f7125
  neo authored Jun 19, 2018
  
  e64f7125
- Merge branch 'dev_neo2' into 'dev' · 7093cc1d
  neo.wang authored Jun 19, 2018
```
[dev] upload balance sheet impl

See merge request root/atms!24
```
  7093cc1d
- [dev] upload balance sheet impl · 9fb3e7e3
  neo authored Jun 19, 2018
  
  9fb3e7e3
14 Jun, 2018 5 commits
- Merge branch 'dev' into dev_frank · 009c7b6b
  frank.xa.zhang authored Jun 14, 2018
  
  009c7b6b
- add new api download preview data · 7e573a12
  frank.xa.zhang authored Jun 14, 2018
  
  7e573a12
- Merge branch 'dev_neo2' into 'dev' · 7cead2a6
  neo.wang authored Jun 14, 2018
```
[DEV] insert vat project init data from admin db

See merge request root/atms!23
```
  7cead2a6
- [DEV] insert vat project init data from admin db · c17a27df
  neo authored Jun 14, 2018
  
  c17a27df
- add new api GetCustomsInvoiceDataForDisplay · 9ac46e3f
  frank.xa.zhang authored Jun 14, 2018
  
  9ac46e3f
13 Jun, 2018 5 commits
- add new api inputInvoicePreviewList · 9b4b919b
  frank.xa.zhang authored Jun 13, 2018
```
add new api queryOutputInvoiceList

fixed issues
```
  9b4b919b
- Merge remote-tracking branch 'origin/dev' into dev · 329be79c
  frank.xa.zhang authored Jun 13, 2018
  
  329be79c
- add new api inputInvoicePreviewList · b5dd8e9c
  frank.xa.zhang authored Jun 13, 2018
```
add new api queryOutputInvoiceList
```
  b5dd8e9c
- Merge branch 'dev_neo2' into 'dev' · e0f53b11
  neo.wang authored Jun 13, 2018
```
[DEV] generate project db and create table

See merge request root/atms!22
```
  e0f53b11
- [DEV] generate project db and create table · a265039d
  neo authored Jun 13, 2018
  
  a265039d
12 Jun, 2018 2 commits
- add new api voucherSelectAdvancedByVoucher · de46aed1
  frank.xa.zhang authored Jun 12, 2018
  
  de46aed1
- add new api voucherSelectAdvancedByEntry · 7b00befd
  frank.xa.zhang authored Jun 12, 2018
  
  7b00befd
11 Jun, 2018 1 commit

Merge branch 'dev' into dev_frank · adedaf39

frank.xa.zhang authored Jun 11, 2018

# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/controller/TBDataImportController.java

adedaf39