Commits · 49b0cd8fbd3ac0cfe53bee00f468fd72a83a75fc · hewei / SiEn · GitLab

05 Nov, 2020 15 commits
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong · 49b0cd8f
  lpx committed Nov 05, 2020
  
  49b0cd8f Browse Files
- # 优惠行程机型名称改成关联获取 · 09ee91bd
  lpx committed Nov 05, 2020
  
  09ee91bd Browse Files
- Merge branch 'Jw' into 'master' · 785db346
```
新增USER_DEVICE_PUSH_TOKEN 保存用户对应的Push信息 减少每次发送查询token

See merge request hewei/Jumeirah!68
```
  JJww committed Nov 05, 2020
  785db346 Browse Files
- Merge branch 'dev/lanpingxiong' into 'master' · a990becd
```
Dev/lanpingxiong

See merge request hewei/Jumeirah!67
```
  lanpingxiong committed Nov 05, 2020
  a990becd Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong · 550c8baf
  lpx committed Nov 05, 2020
  
  550c8baf Browse Files
- # 优惠行程机型名称改成关联获取 · 968c862b
  lpx committed Nov 05, 2020
  
  968c862b Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into Jw · df05398c
  zhangjw committed Nov 05, 2020
  
  df05398c Browse Files
- 1:新增USER_DEVICE_PUSH_TOKEN 保存用户对应的Push信息减少每次发送查询token · bd5a21ea
  zhangjw committed Nov 05, 2020
  
  bd5a21ea Browse Files
- Merge branch 'Jw' into 'master' · b21af718
```
完善订单推送逻辑,客服模块集成友盟推送

See merge request hewei/Jumeirah!66
```
  JJww committed Nov 05, 2020
  b21af718 Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into Jw · bedaafbd
```
 Conflicts:
	common/src/main/resources/mapper/StrokeMapper.xml
```
  zhangjw committed Nov 05, 2020
  bedaafbd Browse Files
- 1:/sys/merchant/getList接口迁移至/app/merchant/list · bb49754d
```
2:客服模块集成Push (iOS未测试)
```
  zhangjw committed Nov 05, 2020
  bb49754d Browse Files
- Merge branch 'dev/lanpingxiong' into 'master' · ad9a032c
```
Dev/lanpingxiong

See merge request hewei/Jumeirah!65
```
  lanpingxiong committed Nov 05, 2020
  ad9a032c Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong · c8b94410
  lpx committed Nov 05, 2020
  
  c8b94410 Browse Files
- # 修复商家端列表查询接口未带mc_id条件查询问题 · 5aead0b6
  lpx committed Nov 05, 2020
  
  5aead0b6 Browse Files
- 1:完善推送订单,保存订单信息逻辑 · f49d3c1c
  zhangjw committed Nov 05, 2020
  
  f49d3c1c Browse Files
04 Nov, 2020 6 commits
- Merge branch 'future/strokeList' into 'master' · a1a82214
```
Future/stroke list

See merge request hewei/Jumeirah!64
```
  hewei committed Nov 04, 2020
  a1a82214 Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into future/sys/userLogin · 45222fd6
```
 Conflicts:
	config/src/main/resources/config/application-test.yml
```
  giaogiao committed Nov 04, 2020
  45222fd6 Browse Files
- 1:完善订单推送逻辑 · 08ef93c7
  zhangjw committed Nov 04, 2020
  
  08ef93c7 Browse Files
- Merge branch 'Jw' into 'master' · e31b24d3
```
Jw

See merge request hewei/Jumeirah!63
```
  JJww committed Nov 04, 2020
  e31b24d3 Browse Files
- 1:完善MQ配置和逻辑 · ddcf6b33
```
2:删除重发逻辑
```
  zhangjw committed Nov 04, 2020
  ddcf6b33 Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into Jw · 48b89eb2
  zhangjw committed Nov 04, 2020
  
  48b89eb2 Browse Files
03 Nov, 2020 8 commits
- 1:完善MQ配置和逻辑 · 9f698d49
```
2:删除重发逻辑
```
  zhangjw committed Nov 03, 2020
  9f698d49 Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into future/sys/userLogin · 77134168
  giaogiao committed Nov 03, 2020
  
  77134168 Browse Files
- 包机介绍推荐: 0不推荐 1推荐 · c9552416
  giaogiao committed Nov 03, 2020
  
  c9552416 Browse Files
- Merge branch 'dev/lanpingxiong' into 'master' · 12a337b4
```
Dev/lanpingxiong

See merge request hewei/Jumeirah!62
```
  lanpingxiong committed Nov 03, 2020
  12a337b4 Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into Jw · 1a78e727
```
 Conflicts:
	api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java
```
  zhangjw committed Nov 03, 2020
  1a78e727 Browse Files
- 1:订单推送到客服模块 · 0a30aeef
```
2:完善MQ配置和逻辑
```
  zhangjw committed Nov 03, 2020
  0a30aeef Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong · 1013a3d1
  lpx committed Nov 03, 2020
  
  1013a3d1 Browse Files
- # 修复商家端列表查询接口未带mc_id条件查询问题 · cd0d5d75
  lpx committed Nov 03, 2020
  
  cd0d5d75 Browse Files
02 Nov, 2020 4 commits
- Merge branch 'dev/lanpingxiong' into 'master' · 16e45ee4
```
# 商家端优惠行程修改接口

See merge request hewei/Jumeirah!61
```
  lanpingxiong committed Nov 02, 2020
  16e45ee4 Browse Files
- # 商家端优惠行程修改接口 · 7751572e
  lpx committed Nov 02, 2020
  
  7751572e Browse Files
- 1:完善推送订单逻辑 · 15696384
  zhangjw committed Nov 02, 2020
  
  15696384 Browse Files
- 1:修改POM依赖独立客服模块 · 46255ed1
  zhangjw committed Nov 02, 2020
  
  46255ed1 Browse Files
30 Oct, 2020 7 commits
- Merge branch 'Jw' into 'master' · c41cfb42
```
Jw

See merge request hewei/Jumeirah!60
```
  JJww committed Oct 30, 2020
  c41cfb42 Browse Files
- Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into Jw · 9a14d02e
  zhangjw committed Oct 30, 2020
  
  9a14d02e Browse Files
- 1:新增MQ 推送订单到客服开发中 · 1437fb73
  zhangjw committed Oct 30, 2020
  
  1437fb73 Browse Files
- Merge branch 'future/strokeList' into 'master' · ffb6800e
```
友盟推送相关,添加或修改推送token

See merge request hewei/Jumeirah!58
```
  hewei committed Oct 30, 2020
  ffb6800e Browse Files
- 1:新增批量获取商户用户信息和用户信息的接口 · a3d61e06
```
2:配置文件修改
3:已知bug修复
```
  zhangjw committed Oct 30, 2020
  a3d61e06 Browse Files
- 友盟推送相关,添加或修改推送token · 2811e6e3
  giaogiao committed Oct 30, 2020
  
  2811e6e3 Browse Files
- Merge branch 'dev/lanpingxiong' into 'master' · c30f1d3d
```
Dev/lanpingxiong

See merge request hewei/Jumeirah!53
```
  lanpingxiong committed Oct 30, 2020
  c30f1d3d Browse Files