Commits · bf3f7cbb835fb0febb065cf419533199d04bf13a · youjj / cloud-platform

17 Jul, 2019 1 commit
- 旅游核销 · bf3f7cbb
  libin authored Jul 17, 2019
  
  bf3f7cbb
16 Jul, 2019 7 commits
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 6054aafa
  libin authored Jul 16, 2019
  
  6054aafa
- 旅游核销 · 034ed65a
  libin authored Jul 16, 2019
  
  034ed65a
- 添加结束公司处理 · 606ae041
  周健威 authored Jul 16, 2019
  
  606ae041
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 0dd93ac1
  libin authored Jul 16, 2019
  
  0dd93ac1
- 旅游核销 · 0208206f
  libin authored Jul 16, 2019
  
  0208206f
- 修改退款bug · a1f15e8a
  周健威 authored Jul 16, 2019
  
  a1f15e8a
- 解决复制头信息导致请求出错的问题，添加通知后台人员短信通知 · 4a81d531
  周健威 authored Jul 16, 2019
  
  4a81d531
15 Jul, 2019 10 commits
- imi 登录 · 10a492c6
  libin authored Jul 15, 2019
  
  10a492c6
- imi 登录 · 1e424470
  libin authored Jul 15, 2019
  
  1e424470
- imi 登录 · f13b531d
  libin authored Jul 15, 2019
  
  f13b531d
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 2f7d1940
  libin authored Jul 15, 2019
  
  2f7d1940
- 短信添加 · 39f83f7c
  hezhen authored Jul 15, 2019
  
  39f83f7c
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 051f533a
  hezhen authored Jul 15, 2019
  
  051f533a
- 短信发送 · c548ee86
  hezhen authored Jul 15, 2019
  
  c548ee86
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 189361b7
  jiaorz authored Jul 15, 2019
  
  189361b7
- 添加积分消息队列接口 · 64668edf
  jiaorz authored Jul 15, 2019
  
  64668edf
- 123 · c76fea50
  hezhen authored Jul 15, 2019
  
  c76fea50
13 Jul, 2019 11 commits
- Merge remote-tracking branch 'origin/dev' into dev · 1988b1c0
  周健威 authored Jul 13, 2019
```
# Conflicts:
#	ace-common/src/main/java/com/github/wxiaoqi/security/common/log/XxLogInterceptor.java
```
  1988b1c0
- 添加短信代码 · 4253dea1
  周健威 authored Jul 13, 2019
  
  4253dea1
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev · 0a919965
  周健威 authored Jul 13, 2019
  
  0a919965
- 修改日志bug · 14690b51
  周健威 authored Jul 13, 2019
  
  14690b51
- 123 · a7e21e41
  hezhen authored Jul 13, 2019
  
  a7e21e41
- sms · e4cfb077
  libin authored Jul 13, 2019
  
  e4cfb077
- 导入会员列表与删除 · 35acddb6
  libin authored Jul 13, 2019
  
  35acddb6
- 短信模板 · e6a4c880
  hezhen authored Jul 13, 2019
  
  e6a4c880
- 导入会员列表与删除 · c63c7180
  libin authored Jul 13, 2019
  
  c63c7180
- 导入会员列表与删除 · 776de38c
  libin authored Jul 13, 2019
  
  776de38c
- 添加短信机 · 7fb092c5
  hezhen authored Jul 13, 2019
  
  7fb092c5
12 Jul, 2019 7 commits
- 修改bug · 702ff965
  周健威 authored Jul 12, 2019
  
  702ff965
- 修改bug · bce414fe
  周健威 authored Jul 12, 2019
  
  bce414fe
- 修改bug · 6f2732de
  周健威 authored Jul 12, 2019
  
  6f2732de
- 修改bug · 7899f85d
  周健威 authored Jul 12, 2019
  
  7899f85d
- 修改bug · 33cceddf
  周健威 authored Jul 12, 2019
  
  33cceddf
- 修改实名认证,证件到期时间 · 299a0f6d
  hanfeng authored Jul 12, 2019
  
  299a0f6d
- 添加日志代码，修改租车列表和确认订单bug · fe70118f
  周健威 authored Jul 12, 2019
  
  fe70118f
10 Jul, 2019 4 commits
- 123 · 7f8c0e78
  hezhen authored Jul 10, 2019
  
  7f8c0e78
- 123 · ca6ef41c
  hezhen authored Jul 10, 2019
  
  ca6ef41c
- 添加提示和省内外旅游退款逻辑 · 5612dbd2
  周健威 authored Jul 10, 2019
  
  5612dbd2
- 解决冲突 · 1faaf47b
  hanfeng authored Jul 10, 2019
  
  1faaf47b