Commits · eb602a1f74e257e5247d36fa8438d12088cf499e · jenkins / order-group

02 Apr, 2020 4 commits
- 升级sdk版本 · eb602a1f
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  eb602a1f Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · e970c08d
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  e970c08d Browse Files
- 删除orderManagerSdk · 059ea37e
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  059ea37e Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · d9630206
```
# Conflicts:
#	.gitignore
```
  shuhu.hou@freemud.cn committed Apr 02, 2020
  d9630206 Browse Files
31 Mar, 2020 1 commit
- productGroupId由Long转String类型 · 68501ef2
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  68501ef2 Browse Files
30 Mar, 2020 12 commits
- 忽略iml文件 · cb35fa48
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  cb35fa48 Browse Files
- Merge branches 'develop' and 'feature/1.9.11-明警' of… · 10d7d71a
```
Merge branches 'develop' and 'feature/1.9.11-明警' of gitlab.freemud.com:order-group-application/order-group into develop
```
  张明警 committed Mar 30, 2020
  10d7d71a Browse Files
- 去掉性别字段 · a74e8a2f
  张明警 committed Mar 30, 2020
  
  a74e8a2f Browse Files
- 忽略iml文件 · 93644fad
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  93644fad Browse Files
- Merge branch 'develop' of… · e105132e
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  姜海波 committed Mar 30, 2020
  e105132e Browse Files
- 普罗米修斯 · e5d0988f
  姜海波 committed Mar 30, 2020
  
  e5d0988f Browse Files
- 修复即时单和预约单不返还打包费 · 37d6aa2f
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  37d6aa2f Browse Files
- Merge branch 'feature/20200330_结算页配送费' into develop · 15712231
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed Mar 30, 2020
  15712231 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · aab06571
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	order-management/order-management.iml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 30, 2020
  aab06571 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · a32b9aac
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	order-management/order-management.iml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 30, 2020
  a32b9aac Browse Files
- 调整 · 4afe8621
  姜海波 committed Mar 30, 2020
  
  4afe8621 Browse Files
- 修复即时单和预约单不返还打包费 · be871695
  shuhu.hou@freemud.cn committed Mar 30, 2020
  
  be871695 Browse Files
28 Mar, 2020 1 commit
- 测试注册 · 5451e4b1
  姜海波 committed Mar 28, 2020
  
  5451e4b1 Browse Files
27 Mar, 2020 13 commits
- 测试注册 · f0dedf6b
  姜海波 committed Mar 27, 2020
  
  f0dedf6b Browse Files
- 测试注册 · 90c3df96
  姜海波 committed Mar 27, 2020
  
  90c3df96 Browse Files
- 添加oms操作 · 0ac0e610
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  0ac0e610 Browse Files
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into develop · 39d1e838
  dingkai committed Mar 27, 2020
  
  39d1e838 Browse Files
- 升级sdk · 9d7c9428
  dingkai committed Mar 27, 2020
  
  9d7c9428 Browse Files
- 升级sdk · 1915d0a9
  dingkai committed Mar 27, 2020
  
  1915d0a9 Browse Files
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into develop · 7908100c
  dingkai committed Mar 27, 2020
  
  7908100c Browse Files
- 判断优化 · bb0af414
  dingkai committed Mar 27, 2020
  
  bb0af414 Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · 57b528d0
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  57b528d0 Browse Files
- 修改assortment-order-sdk依赖delivery-sdk问题 · 88b11cd2
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  88b11cd2 Browse Files
- 合并版本 · f6527e4d
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  f6527e4d Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · 6c921203
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/order-management.iml
```
  shuhu.hou@freemud.cn committed Mar 27, 2020
  6c921203 Browse Files
- orderManager 新增接单接口 · c5a1c9b1
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  c5a1c9b1 Browse Files
26 Mar, 2020 9 commits
- 调整浮点 · a245b697
  姜海波 committed Mar 26, 2020
  
  a245b697 Browse Files
- 调整浮点 · 364550d2
  姜海波 committed Mar 26, 2020
  
  364550d2 Browse Files
- 调整浮点 · b1f522c3
  姜海波 committed Mar 26, 2020
  
  b1f522c3 Browse Files
- orderManager一期整理 · 928ba739
  shuhu.hou@freemud.cn committed Mar 26, 2020
  
  928ba739 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · b9da6459
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  b9da6459 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 15d595df
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  15d595df Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · d79499af
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  d79499af Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 2a86fae9
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  2a86fae9 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · eff27a05
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  eff27a05 Browse Files