Commits · 0f86b322e2f23ed1558b92a72dbb27d6220573e0 · order-group-application / order-group · GitLab

25 May, 2021 2 commits
- 升级sdk · 0f86b322
  chongfu.liang committed May 25, 2021
  
  0f86b322 Browse Files
- Merge branch 'feature/20210423-新增食派士渠道-lcf' · 17ebf5e4
  chongfu.liang committed May 25, 2021
  
  17ebf5e4 Browse Files
24 May, 2021 2 commits
- Merge branch 'feature/20210513-状态埋点监控查询-王世昌' · 8edb7b84
  王世昌 committed May 24, 2021
  
  8edb7b84 Browse Files
- Merge branch 'feature/20210510/v2.0.30-记录每天下单门店-周晓航' · bf02e4aa
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
```
  周晓航 committed May 24, 2021
  bf02e4aa Browse Files
21 May, 2021 5 commits
- 预发布注释掉配送费 · acb3e909
  zhiheng.zhang committed May 21, 2021
  
  acb3e909 Browse Files
- 预发布注释掉配送费 · 2c6f4214
  zhiheng.zhang committed May 21, 2021
  
  2c6f4214 Browse Files
- 核销券添加商城渠道 · 8050c25c
  zhiheng.zhang committed May 21, 2021
  
  8050c25c Browse Files
- 核销券添加商城渠道 · d383fbce
  zhiheng.zhang committed May 21, 2021
  
  d383fbce Browse Files
- 核销券添加商城渠道 · 15a22b01
  zhiheng.zhang committed May 21, 2021
  
  15a22b01 Browse Files
20 May, 2021 14 commits
- Merge remote-tracking branch 'origin/master' · 6f06143d
  徐康 committed May 21, 2021
  
  6f06143d Browse Files
- sdk问题 · f071ff46
  徐康 committed May 21, 2021
  
  f071ff46 Browse Files
- sdk升级 · 64a1f193
  徐康 committed May 21, 2021
  
  64a1f193 Browse Files
- Merge remote-tracking branch 'origin/master' · 5314e902
  ping.wu committed May 21, 2021
  
  5314e902 Browse Files
- Merge · 4c07700d
  ping.wu committed May 21, 2021
  
  4c07700d Browse Files
- sdk升级 · bf0cc02b
  徐康 committed May 21, 2021
  
  bf0cc02b Browse Files
- 是否监控字段 · d470bd2d
  王世昌 committed May 20, 2021
  
  d470bd2d Browse Files
- Merge branch 'feature/xukang_20210517_麦咖啡EVM券' · 6f27d8ad
  徐康 committed May 20, 2021
  
  6f27d8ad Browse Files
- 异常信息处理 · 719f7747
  徐康 committed May 20, 2021
  
  719f7747 Browse Files
- Merge branch 'feature/xukang_20210517_麦咖啡EVM券' · 93886ea2
  徐康 committed May 20, 2021
  
  93886ea2 Browse Files
- 批量商品操作校验 · 8feb760c
  徐康 committed May 20, 2021
  
  8feb760c Browse Files
- 小票打印赠品和加价购冲突 · 407ca50f
  hanghang.wang committed May 20, 2021
  
  407ca50f Browse Files
- 小票打印赠品和加价购冲突 · c8a29152
  hanghang.wang committed May 20, 2021
  
  c8a29152 Browse Files
- Merge branch 'feature/20210517/v2.0.30-腾讯有数数据上报计算修改-周晓航-ID1029765' · c3743a76
  周晓航 committed May 20, 2021
  
  c3743a76 Browse Files
19 May, 2021 5 commits
- 修改日志打印 · a770b93b
  周晓航 committed May 19, 2021
  
  a770b93b Browse Files
- Merge branch 'feature/20210430-添加两个字段-lcf' · b98b69bc
  chongfu.liang committed May 19, 2021
  
  b98b69bc Browse Files
- 新算价 · b5a0e980
  chongfu.liang committed May 19, 2021
  
  b5a0e980 Browse Files
- Merge remote-tracking branch 'origin/master' · 3c093578
  chongfu.liang committed May 19, 2021
  
  3c093578 Browse Files
- 修改接口时间传参数据格式 · 58b28046
  周晓航 committed May 19, 2021
  
  58b28046 Browse Files
18 May, 2021 12 commits
- Merge remote-tracking branch 'origin/master' · ce0a614a
  zhiheng.zhang committed May 18, 2021
  
  ce0a614a Browse Files
- 调用配送关闭 · 7180015c
  zhiheng.zhang committed May 18, 2021
  
  7180015c Browse Files
- Merge branches 'feature/20210429_订单自动扭转开关_wuping' and 'master' of… · a3cb5c4f
```
Merge branches 'feature/20210429_订单自动扭转开关_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
```
  ping.wu committed May 18, 2021
  a3cb5c4f Browse Files
- 调用配送关闭 · 3484180b
  zhiheng.zhang committed May 18, 2021
  
  3484180b Browse Files
- Merge remote-tracking branch 'origin/master' · d61ff759
  zhiheng.zhang committed May 18, 2021
  
  d61ff759 Browse Files
- 调用配送关闭 · e212ca58
  zhiheng.zhang committed May 18, 2021
  
  e212ca58 Browse Files
- Merge branches 'feature/20210518_邮件告警升级' and 'master' of… · 5c129fd2
```
Merge branches 'feature/20210518_邮件告警升级' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed May 18, 2021
  5c129fd2 Browse Files
- 调用配送关闭 · bfbf9642
  zhiheng.zhang committed May 18, 2021
  
  bfbf9642 Browse Files
- 调用配送关闭 · 6fb1e5f2
  zhiheng.zhang committed May 18, 2021
  
  6fb1e5f2 Browse Files
- 调用配送关闭 · 6e95b418
  zhiheng.zhang committed May 18, 2021
  
  6e95b418 Browse Files
- 调用配送打开 · 10d759a9
  zhiheng.zhang committed May 18, 2021
  
  10d759a9 Browse Files
- sdk 热数据 · 764170a9
  zhiheng.zhang committed May 18, 2021
  
  764170a9 Browse Files