Commits · 7c48f3bbecd77ae8d9e2f7ba9fa25f531e86c4dc · order-group-application / order-group · GitLab

03 Aug, 2020 2 commits
- Merge branch '202007131400' into develop · 7c48f3bb
  zhiheng.zhang committed Aug 03, 2020
  
  7c48f3bb Browse Files
- 添加字段订单类型 · 5742f801
  zhiheng.zhang committed Aug 03, 2020
  
  5742f801 Browse Files
02 Aug, 2020 8 commits
- 删除多余的注释 · 92fca449
  zhiheng.zhang committed Aug 02, 2020
  
  92fca449 Browse Files
- 修改java8的处理逻辑 · ab7e394a
  zhiheng.zhang committed Aug 02, 2020
  
  ab7e394a Browse Files
- 修改java8的处理逻辑 · 89af6262
  zhiheng.zhang committed Aug 02, 2020
  
  89af6262 Browse Files
- Merge branch '202007131400' into develop · bcb0e6a1
  zhiheng.zhang committed Aug 02, 2020
  
  bcb0e6a1 Browse Files
- 聚合层取值修改为结算值 · 8da97f39
  zhiheng.zhang committed Aug 02, 2020
  
  8da97f39 Browse Files
- 聚合层取值修改为结算值 · 00061707
  zhiheng.zhang committed Aug 02, 2020
  
  00061707 Browse Files
- Merge remote-tracking branch 'origin/202007131400' into 202007131400 · d455c1f9
  zhiheng.zhang committed Aug 02, 2020
  
  d455c1f9 Browse Files
- 添加自主积分审核不通过接口 · 3b2b6daf
  zhiheng.zhang committed Aug 02, 2020
  
  3b2b6daf Browse Files
01 Aug, 2020 5 commits
- 积分订单暂定8月份之后的 · fe3c7478
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  fe3c7478 Browse Files
- 升级购物车sdk · d4047293
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  d4047293 Browse Files
- 升级购物车sdk · 29d8b0e6
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  29d8b0e6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 72794160
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 01, 2020
  72794160 Browse Files
- fix:originalAmount · 15bc70d9
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  15bc70d9 Browse Files
30 Jul, 2020 16 commits
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 7fe23022
  chongfu.liang committed Jul 30, 2020
  
  7fe23022 Browse Files
- 加料商品开发 · 26198180
  chongfu.liang committed Jul 30, 2020
  
  26198180 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · a8fbcfc9
  chongfu.liang committed Jul 30, 2020
  
  a8fbcfc9 Browse Files
- 加料商品开发 · 848c516f
  chongfu.liang committed Jul 30, 2020
  
  848c516f Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 1dd62814
  chongfu.liang committed Jul 30, 2020
  
  1dd62814 Browse Files
- 加料商品开发 · fb48d5fc
  chongfu.liang committed Jul 30, 2020
  
  fb48d5fc Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · c72d8425
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  c72d8425 Browse Files
- 去掉多余导入 · 5a8e02c9
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  5a8e02c9 Browse Files
- assortment-shopping-sdk 升级 · 330513ce
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  330513ce Browse Files
- assortment-shopping-sdk 升级 · f0b5b013
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  f0b5b013 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · e513408e
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Jul 30, 2020
  e513408e Browse Files
- 商品加料 · 77299951
  xiaoer.li@freemud.com committed Jul 30, 2020
  
  77299951 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · b14608cc
  chongfu.liang committed Jul 30, 2020
  
  b14608cc Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · a6c584b8
  chongfu.liang committed Jul 30, 2020
  
  a6c584b8 Browse Files
- 加料商品开发 · f2c1166f
  chongfu.liang committed Jul 30, 2020
  
  f2c1166f Browse Files
- 数据转换处理 · 0130a126
  zhiheng.zhang committed Jul 30, 2020
  
  0130a126 Browse Files
29 Jul, 2020 9 commits
- Merge branch 'develop' of… · c9c054f3
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  zhiheng.zhang committed Jul 29, 2020
  c9c054f3 Browse Files
- 图片url返回处理 · fd21c7f1
  zhiheng.zhang committed Jul 29, 2020
  
  fd21c7f1 Browse Files
- Merge branch '20200729_订单完成时送集点_zhanghongtao' of… · e1044ee5
```
Merge branch '20200729_订单完成时送集点_zhanghongtao' of gitlab.freemud.com:order-group-application/order-group into develop
```
  张洪涛 committed Jul 29, 2020
  e1044ee5 Browse Files
- 支付成功时送集点（移除） · 4534328a
  张洪涛 committed Jul 29, 2020
  
  4534328a Browse Files
- Merge branch 'freature/20200729_农工商未支付冲正积分' into develop · b0c53f9d
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed Jul 29, 2020
  b0c53f9d Browse Files
- 农工商未支付冲正送积分 · dd76defd
  shuhu.hou@freemud.cn committed Jul 29, 2020
  
  dd76defd Browse Files
- 为空直接返回 · c55973f2
  zhiheng.zhang committed Jul 29, 2020
  
  c55973f2 Browse Files
- 解决冲突 · fc84bc07
  zhiheng.zhang committed Jul 29, 2020
  
  fc84bc07 Browse Files
- 日期查询7月份之后的 · bb370092
  zhiheng.zhang committed Jul 29, 2020
  
  bb370092 Browse Files