Commits · 9df25c4c330092a87458ed175f0b3eb3f39e33e8 · order-group-application / order-group · GitLab

15 Jul, 2021 6 commits
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · 9df25c4c
  周晓航 committed Jul 15, 2021
  
  9df25c4c Browse Files
- Merge branch 'KA-20210714-线上购物车异常修复' · 59c2137a
  周晓航 committed Jul 15, 2021
  
  59c2137a Browse Files
- 生产bug NPE修复 · d6b4f2ab
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 15, 2021
  d6b4f2ab Browse Files
- Merge branches 'feature/20210713_抖音联调_wuping' and 'master' of… · 04665e7f
```
Merge branches 'feature/20210713_抖音联调_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 15, 2021
  04665e7f Browse Files
- 积分抵扣空指针问题 · 4a7ab7de
  胡敬轩 committed Jul 15, 2021
  
  4a7ab7de Browse Files
- Merge branch 'KA-20210714-线上购物车异常修复' · 0ad7494f
  周晓航 committed Jul 15, 2021
  
  0ad7494f Browse Files
14 Jul, 2021 5 commits
- 同时修改告警规则 · 734a510a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 14, 2021
  734a510a Browse Files
- Merge remote-tracking branch 'origin/master' · 71806011
  李学兴 committed Jul 14, 2021
  
  71806011 Browse Files
- Merge branch 'feature/20210701_prometheusMqDatasource_lxx' · 6500aea4
  李学兴 committed Jul 14, 2021
  
  6500aea4 Browse Files
- 线上 NoSuchElementException bug修复 · cb0ca99b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 14, 2021
  cb0ca99b Browse Files
- 线上 NoSuchElementException bug修复 · 0e278e1a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 14, 2021
  0e278e1a Browse Files
13 Jul, 2021 8 commits
- 外卖单支付成功返回订单状态描述修改 · 0a137cb1
  ping.wu committed Jul 13, 2021
  
  0a137cb1 Browse Files
- 代码格式化，删除重复代码 · 8a0c4ab6
  ping.wu committed Jul 13, 2021
  
  8a0c4ab6 Browse Files
- 判断修改 · 6f8920ff
  ping.wu committed Jul 13, 2021
  
  6f8920ff Browse Files
- 门店营业开始时间是24:00点问题修改 · 252d52d1
  ping.wu committed Jul 13, 2021
  
  252d52d1 Browse Files
- 升级 pom里面的 sdk版本 · 95822772
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 13, 2021
  95822772 Browse Files
- 抖音退款退款原因必传 · 88557734
  ping.wu committed Jul 13, 2021
  
  88557734 Browse Files
- Merge branch 'feature/20210707_hekuoOrderAutoComplete_miaohui' into 'master' · e961ec71
```
Feature/20210707 hekuo order auto complete miaohui

See merge request !127
```
  缪晖 committed Jul 13, 2021
  e961ec71 Browse Files
- Merge branch 'master' into 20210702-日志规范-lxx · 29e36568
  李学兴 committed Jul 13, 2021
  
  29e36568 Browse Files
12 Jul, 2021 7 commits
- | 2.1.84-RELEASE | KA-20210702-非码发版日售后单时间推迟 | 周晓航 | 2021-07-12| · 41971239
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 12, 2021
  41971239 Browse Files
- Merge branch 'KA-20210702-非码发版日售后单时间推迟-周晓航' · 29710b8d
  周晓航 committed Jul 12, 2021
  
  29710b8d Browse Files
- bug修复日志删除 · b381413d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 12, 2021
  b381413d Browse Files
- 日志打印 · 47a196a3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 12, 2021
  47a196a3 Browse Files
- 日志打印 · 28d5b25a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 12, 2021
  28d5b25a Browse Files
- public final static boolean printDebug = true; · 9cfd5745
  黄兆良 committed Jul 12, 2021
  
  9cfd5745 Browse Files
- public final static boolean printDebug = true; · 1bd17173
  黄兆良 committed Jul 12, 2021
  
  1bd17173 Browse Files
10 Jul, 2021 5 commits
- Merge branch 'hotfix/20210711_ordercentersdk_scope_miaohui' into 'master' · 3e6d6b40
```
rollback

See merge request !125
```
  缪晖 committed Jul 10, 2021
  3e6d6b40 Browse Files
- rollback · 5669215f
  缪晖 committed Jul 10, 2021
  
  5669215f Browse Files
- 订单聚合SDK版本升级只2.1.83，对订单基础SDK引用添加scope · 2bfd73b5
  缪晖 committed Jul 10, 2021
  
  2bfd73b5 Browse Files
- Merge branch 'hotfix/20210711_ordercentersdk_scope_miaohui' into 'master' · 5614acc7
```
订单基础SDK添加scope为provided，各服务需自行引入

See merge request !124
```
  缪晖 committed Jul 10, 2021
  5614acc7 Browse Files
- 订单基础SDK添加scope为provided，各服务需自行引入 · d681915c
  缪晖 committed Jul 10, 2021
  
  d681915c Browse Files
09 Jul, 2021 6 commits
- 加价购问题发布 · 55593257
  zhiheng.zhang committed Jul 09, 2021
  
  55593257 Browse Files
- sdk 升级 · 5438af80
  zhiheng.zhang committed Jul 09, 2021
  
  5438af80 Browse Files
- kehuo need auto order complete · 09f5fe92
  缪晖 committed Jul 09, 2021
  
  09f5fe92 Browse Files
- kehuo need auto order complete · bad3e3a7
  缪晖 committed Jul 09, 2021
  
  bad3e3a7 Browse Files
- 修改 bug · 328e4148
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 09, 2021
  328e4148 Browse Files
- opt@20210702-日志规范-lxx:# MessageFormat.format 更换到 MessageFormatter.arrayFormat · 61ce2d25
  李学兴 committed Jul 09, 2021
  
  61ce2d25 Browse Files
08 Jul, 2021 3 commits
- 修改 bug · dff7e16c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 08, 2021
  dff7e16c Browse Files
- 修改 bug · 9a1e9745
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 08, 2021
  9a1e9745 Browse Files
- 修改 bug · ac9b3966
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 08, 2021
  ac9b3966 Browse Files