Commits · 0fe565df15a723e4f7c148ea557c1527d17a3c08 · wangxiaoming / traffic-front

29 Mar, 2019 14 commits
- fix bug · 0fe565df
  chase authored Mar 29, 2019
  
  0fe565df
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 09ea917f
  chase authored Mar 29, 2019
  
  09ea917f
- fix bug · 38a0c64f
  chase authored Mar 29, 2019
  
  38a0c64f
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · e07ea407
  eddie.woo authored Mar 29, 2019
  
  e07ea407
- 报表排序 · 2c8f34fd
  eddie.woo authored Mar 29, 2019
  
  2c8f34fd
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 6e3260ed
  chase authored Mar 29, 2019
  
  6e3260ed
- fixbug · af74bb1e
  chase authored Mar 29, 2019
  
  af74bb1e
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 839e2e84
  kevin authored Mar 29, 2019
  
  839e2e84
- # · 66278509
  kevin authored Mar 29, 2019
  
  66278509
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 13c71b3b
  chase authored Mar 29, 2019
  
  13c71b3b
- fix bug · ca29a590
  chase authored Mar 29, 2019
  
  ca29a590
- fix bug · cad34ca0
  chase authored Mar 29, 2019
  
  cad34ca0
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 7ffd94f5
  zhkwei authored Mar 29, 2019
  
  7ffd94f5
- CIT固定资产页面格式优化 · 31bc6a3e
  zhkwei authored Mar 29, 2019
  
  31bc6a3e
28 Mar, 2019 26 commits
- Modify Permission · 21887742
  Cheng C Yang authored Mar 28, 2019
  
  21887742
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · dbac0c20
  zhkwei authored Mar 28, 2019
  
  dbac0c20
- CIT固定资产bug修改 · 2c8306d9
  zhkwei authored Mar 28, 2019
  
  2c8306d9
- fix bug · dcfe14a3
  chase authored Mar 28, 2019
  
  dcfe14a3
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 27e20682
  chase authored Mar 28, 2019
  
  27e20682
- fix bug · 63676740
  chase authored Mar 28, 2019
  
  63676740
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · ddbcf971
  kevin authored Mar 28, 2019
  
  ddbcf971
- # · b047a373
  kevin authored Mar 28, 2019
  
  b047a373
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 2339e2cb
  chase authored Mar 28, 2019
  
  2339e2cb
- fix bug · 4ce1f0fc
  chase authored Mar 28, 2019
  
  4ce1f0fc
- Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql · 93bb3af0
  zhkwei authored Mar 28, 2019
  
  93bb3af0
- CIT分配表的生成，固资的生成 · e7c526d4
  zhkwei authored Mar 28, 2019
  
  e7c526d4
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 864f1c9f
  eddie.woo authored Mar 28, 2019
  
  864f1c9f
- 1.机构权限bug；2.BS、PL预览bug · eb6c0ce2
  eddie.woo authored Mar 28, 2019
  
  eb6c0ce2
- fix bug · 75c4a42d
  chase authored Mar 28, 2019
  
  75c4a42d
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 03b716e9
  chase authored Mar 28, 2019
  
  03b716e9
- fix bug · 113c6969
  chase authored Mar 28, 2019
  
  113c6969
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 6a08a26c
  kevin authored Mar 28, 2019
  
  6a08a26c
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · 65ea97e1
  chase authored Mar 28, 2019
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
```
  65ea97e1
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · ad046101
  kevin authored Mar 28, 2019
  
  ad046101
- fix · 104bdb39
  kevin authored Mar 28, 2019
  
  104bdb39
- fix bug · e65d41e8
  chase authored Mar 28, 2019
  
  e65d41e8
- $CN\Frank XA Zhang's avatar$
  
  add two column in period_cell_data for validate result --frank · 03f9e637
  CN\Frank XA Zhang authored Mar 28, 2019
  
  03f9e637
- # · 99ae35cf
  kevin authored Mar 28, 2019
  
  99ae35cf
- # · 4780055f
  kevin authored Mar 28, 2019
  
  4780055f
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql · c9fd2d49
  kevin authored Mar 28, 2019
  
  c9fd2d49