Commits · 46232002ec4265c5862808b31becffd984970bcc · order-group-application / order-group · GitLab

09 Aug, 2021 31 commits
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 46232002
  周晓航 committed Aug 09, 2021
  
  46232002 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · f356404a
  周晓航 committed Aug 09, 2021
  
  f356404a Browse Files
- 打日志 · 67724050
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  67724050 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 3653449e
  ping.wu committed Aug 09, 2021
  
  3653449e Browse Files
- 打印日志 · 03b5fa28
  ping.wu committed Aug 09, 2021
  
  03b5fa28 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 56d38c3b
  周晓航 committed Aug 09, 2021
  
  56d38c3b Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 9dd39743
  周晓航 committed Aug 09, 2021
  
  9dd39743 Browse Files
- 打日志 · 90cf81ce
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  90cf81ce Browse Files
- Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of… · 9598ac4f
```
Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 09, 2021
  9598ac4f Browse Files
- key修改 · c5f258c6
  ping.wu committed Aug 09, 2021
  
  c5f258c6 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 59a1c0ee
  周晓航 committed Aug 09, 2021
  
  59a1c0ee Browse Files
- 打日志 · 04574b54
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  04574b54 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 723a9004
  周晓航 committed Aug 09, 2021
  
  723a9004 Browse Files
- 打日志 · f006ecc1
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  f006ecc1 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 1a4e62a3
  周晓航 committed Aug 09, 2021
  
  1a4e62a3 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 35b59d67
  周晓航 committed Aug 09, 2021
  
  35b59d67 Browse Files
- 打日志 · a21a40a5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  a21a40a5 Browse Files
- Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of… · 703c1b9f
```
Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  ping.wu committed Aug 09, 2021
  703c1b9f Browse Files
- 限购数量为0判断修改 · 4e754656
  ping.wu committed Aug 09, 2021
  
  4e754656 Browse Files
- Merge branch 'KA-B端excel下载内容优化-20210727-zxh' into qa · 0eddce46
  周晓航 committed Aug 09, 2021
  
  0eddce46 Browse Files
- 打日志 · 4bb03b01
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  4bb03b01 Browse Files
- 打日志 · c30270b4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 09, 2021
  c30270b4 Browse Files
- Merge branch 'feature/xukang_20210809_购买月卡不使用多余优惠过滤' into qa · 832edcd1
  徐康 committed Aug 09, 2021
  
  832edcd1 Browse Files
- 问题修复 · b12ee30e
  徐康 committed Aug 09, 2021
  
  b12ee30e Browse Files
- 问题修复 · e6152da4
  徐康 committed Aug 09, 2021
  
  e6152da4 Browse Files
- 问题修复 · 0b8a62f6
  徐康 committed Aug 09, 2021
  
  0b8a62f6 Browse Files
- Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of… · 06ac407e
```
Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  ping.wu committed Aug 09, 2021
  06ac407e Browse Files
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of… · 17cc7be7
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 09, 2021
  17cc7be7 Browse Files
- 购物车限购数量调整 · b94fa912
  ping.wu committed Aug 09, 2021
  
  b94fa912 Browse Files
- 业务异常打印日志报错升级2.0.0-SNAPSHOT · c4b6e8ea
  ping.wu committed Aug 09, 2021
  
  c4b6e8ea Browse Files
- detailType.getProductId() 空报错修改 · ce3a1c49
  ping.wu committed Aug 09, 2021
  
  ce3a1c49 Browse Files
06 Aug, 2021 5 commits
- Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of… · 3ce86ffb
```
Merge branches 'feature/20210806_日志问题修复_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 06, 2021
  3ce86ffb Browse Files
- 500状态码处理 · b879b279
  ping.wu committed Aug 06, 2021
  
  b879b279 Browse Files
- Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of… · 1fc1bbae
```
Merge branches 'feature/20210806_购物车限购数量redis_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  ping.wu committed Aug 06, 2021
  1fc1bbae Browse Files
- 购物车限购数量优化 · 1fa7810e
  ping.wu committed Aug 06, 2021
  
  1fa7810e Browse Files
- sdk新增方法 · 0752a91e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Aug 06, 2021
  0752a91e Browse Files
05 Aug, 2021 4 commits
- Merge branch 'feature/bowen-fix-cartlimit' · 1b93a61a
  胡博文 committed Aug 06, 2021
  
  1b93a61a Browse Files
- 回退代码 · 24fe754b
  胡博文 committed Aug 06, 2021
  
  24fe754b Browse Files
- 还原购物车代码 · fb2685be
  胡博文 committed Aug 06, 2021
  
  fb2685be Browse Files
- remover · 91741560
  胡博文 committed Aug 06, 2021
  
  91741560 Browse Files