Commits · 9569f799ed10068722d1e935cb157802602d565c · jenkins / order-group · GitLab

07 Apr, 2020 6 commits
- order-management 聚合订单sdk同步升级 · 9569f799
  ping.wu committed Apr 07, 2020
  
  9569f799 Browse Files
- Merge branches 'develop' and 'feature/20200407_储值卡空指针修改_wuping' of… · 9a7161ac
```
Merge branches 'develop' and 'feature/20200407_储值卡空指针修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	.gitignore
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/resources/application-dev.properties
#	order-application-service/src/main/resources/application.properties
```
  ping.wu committed Apr 07, 2020
  9a7161ac Browse Files
- 增加非空判断 · 44ecdb1e
  ping.wu committed Apr 07, 2020
  
  44ecdb1e Browse Files
- Merge branch 'feature/20200324_套餐商品组校验' · 8aca96cf
```
# Conflicts:
#	.gitignore
```
  shuhu.hou@freemud.cn committed Apr 07, 2020
  8aca96cf Browse Files
- 增加超时配置 · 55a0b53b
  姜海波 committed Apr 07, 2020
  
  55a0b53b Browse Files
- 增加超时配置 · dfb513dd
  姜海波 committed Apr 07, 2020
  
  dfb513dd Browse Files
03 Apr, 2020 5 commits
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' · aab7a0f8
```
# Conflicts:
#	order-application-service/pom.xml
```
  dingkai committed Apr 03, 2020
  aab7a0f8 Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · c7f31d59
  shuhu.hou@freemud.cn committed Apr 03, 2020
  
  c7f31d59 Browse Files
- 开放平台不传入门店，忽略门店校验 · b8bfc9fe
  shuhu.hou@freemud.cn committed Apr 03, 2020
  
  b8bfc9fe Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · d5d0dac6
  shuhu.hou@freemud.cn committed Apr 03, 2020
  
  d5d0dac6 Browse Files
- 开放平台不传入门店，忽略门店校验 · 136c0028
  shuhu.hou@freemud.cn committed Apr 03, 2020
  
  136c0028 Browse Files
02 Apr, 2020 20 commits
- Merge branch 'feature/20200325_oms接单' into develop · bcbbf480
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  bcbbf480 Browse Files
- orderManager新增返回参数 · 9d362f21
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  9d362f21 Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · 0f1a55c2
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  0f1a55c2 Browse Files
- 添加orderManager rest配置文件 · 0f1de10d
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  0f1de10d Browse Files
- 修改gitignore · 9bea9bdf
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  9bea9bdf Browse Files
- Delete order-management.iml · 4c8c73e0
  shuhu.hou committed Apr 02, 2020
  
  4c8c73e0 Browse Files
- 修改maven依赖 · c4f8110e
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  c4f8110e Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · 0850d671
```
# Conflicts:
#	order-management/order-management.iml
```
  shuhu.hou@freemud.cn committed Apr 02, 2020
  0850d671 Browse Files
- Merge remote-tracking branch 'origin/feature/20200325_oms接单' into feature/20200325_oms接单 · 588c59b9
```
# Conflicts:
#	order-management/order-management.iml
```
  shuhu.hou@freemud.cn committed Apr 02, 2020
  588c59b9 Browse Files
- 修改maven依赖 · 0e0c0cb2
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  0e0c0cb2 Browse Files
- 删除orderManagerSdk · 9c7adfaa
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  9c7adfaa Browse Files
- Delete order-management.iml · cc64825d
  shuhu.hou committed Apr 02, 2020
  
  cc64825d Browse Files
- Delete order-management.iml · 6bb419fb
  shuhu.hou committed Apr 02, 2020
  
  6bb419fb Browse Files
- Delete order-management.iml · 7140b959
  shuhu.hou committed Apr 02, 2020
  
  7140b959 Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · 484f1502
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  484f1502 Browse Files
- 删除orderManagerSdk · 23974cdb
  shuhu.hou@freemud.cn committed Apr 02, 2020
  
  23974cdb Browse Files
- 升级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 9 commits
- productGroupId由Long转String类型 · 68501ef2
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  68501ef2 Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · 15b75da7
  姜海波 committed Mar 31, 2020
  
  15b75da7 Browse Files
- 去掉普罗米修斯 · 103ea542
  姜海波 committed Mar 31, 2020
  
  103ea542 Browse Files
- productGroupId由Long转String类型 · 7e724c4b
  shuhu.hou@freemud.cn committed Mar 31, 2020
  
  7e724c4b Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · 5d8aa010
  姜海波 committed Mar 31, 2020
  
  5d8aa010 Browse Files
- 修正配置 · b135cf2f
  姜海波 committed Mar 31, 2020
  
  b135cf2f Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · 7aafa2d0
  yong.huang committed Mar 31, 2020
  
  7aafa2d0 Browse Files
- 增加健康检测接口 · cb704f96
  yong.huang committed Mar 31, 2020
  
  cb704f96 Browse Files
- 增加健康检测接口 · d483e439
  yong.huang committed Mar 31, 2020
  
  d483e439 Browse Files