Commits · 1a7d2e019b92995a6725e538c59dcf3897471b8e · base_platform_enterprise / gic-store · GitLab

05 Jul, 2019 16 commits
- Merge remote-tracking branch 'origin/developer' into developer · 1a7d2e01
  zhiwj authored Jul 05, 2019
  
  1a7d2e01 Browse Files
- 修改task · 3d54513b
  zhiwj authored Jul 05, 2019
  
  3d54513b Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 44df3407
  guojuxing authored Jul 05, 2019
  
  44df3407 Browse Files
- 分组策略 · d3c9c849
  guojuxing authored Jul 05, 2019
  
  d3c9c849 Browse Files
- 错误日志导出 · a26a6220
  zhiwj authored Jul 05, 2019
  
  a26a6220 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 2bf20e7f
  guojuxing authored Jul 05, 2019
  
  2bf20e7f Browse Files
- 门店对外接口 · 8f2a6e88
  zhiwj authored Jul 05, 2019
  
  8f2a6e88 Browse Files
- 分组策略 · e5a40c23
  guojuxing authored Jul 05, 2019
  
  e5a40c23 Browse Files
- 省市区 · 97db5d20
  陶光胜 authored Jul 05, 2019
  
  97db5d20 Browse Files
- 省市区 · ff4ad5ba
  陶光胜 authored Jul 05, 2019
  
  ff4ad5ba Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 5ac760c0
  陶光胜 authored Jul 05, 2019
  
  5ac760c0 Browse Files
- 省市区 · d5e78029
  陶光胜 authored Jul 05, 2019
  
  d5e78029 Browse Files
- 分组策略 · 77f0f11f
  guojuxing authored Jul 05, 2019
  
  77f0f11f Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 43dadca6
  guojuxing authored Jul 05, 2019
  
  43dadca6 Browse Files
- 分组策略 · a16c6a5c
  guojuxing authored Jul 05, 2019
  
  a16c6a5c Browse Files
- 错误日志 · 2cd1f87a
  zhiwj authored Jul 05, 2019
  
  2cd1f87a Browse Files
04 Jul, 2019 24 commits
- Merge remote-tracking branch 'origin/developer' into developer · 82d392f5
  guojuxing authored Jul 04, 2019
  
  82d392f5 Browse Files
- 分组策略 · 0d73bda8
  guojuxing authored Jul 04, 2019
  
  0d73bda8 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e1e6a7ed
  zhiwj authored Jul 04, 2019
  
  e1e6a7ed Browse Files
- 批量导入 · 86db86f5
  zhiwj authored Jul 04, 2019
  
  86db86f5 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 61a1a95e
  guojuxing authored Jul 04, 2019
  
  61a1a95e Browse Files
- 分组策略 · e2556f29
  guojuxing authored Jul 04, 2019
  
  e2556f29 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · cb185b9d
  zhiwj authored Jul 04, 2019
  
  cb185b9d Browse Files
- 批量导入 · 364aec5a
  zhiwj authored Jul 04, 2019
  
  364aec5a Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · d8be9485
  陶光胜 authored Jul 04, 2019
  
  d8be9485 Browse Files
- 批量导入 · 65ef6181
  zhiwj authored Jul 04, 2019
  
  65ef6181 Browse Files
- 依赖 · 51a771f7
  陶光胜 authored Jul 04, 2019
  
  51a771f7 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 3cd1126c
  zhiwj authored Jul 04, 2019
  
  3cd1126c Browse Files
- 批量导入 · bccc81cf
  zhiwj authored Jul 04, 2019
  
  bccc81cf Browse Files
- 分组策略 · 606b95ed
  guojuxing authored Jul 04, 2019
  
  606b95ed Browse Files
- 分组策略 · ce9d0257
  guojuxing authored Jul 04, 2019
  
  ce9d0257 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 31ac754d
  guojuxing authored Jul 04, 2019
  
  31ac754d Browse Files
- 分组策略 · 118f4eba
  guojuxing authored Jul 04, 2019
  
  118f4eba Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 01faaa07
```
# Conflicts:
#	gic-store-api/src/main/java/com/gic/store/service/StoreStrategyApiService.java
#	gic-store-service/src/main/java/com/gic/store/service/impl/StoreStrategyServiceImpl.java
```
  陶光胜 authored Jul 04, 2019
  01faaa07 Browse Files
- 省市区 · 44d68365
  陶光胜 authored Jul 04, 2019
  
  44d68365 Browse Files
- 分组策略 · 5227ec54
  guojuxing authored Jul 04, 2019
  
  5227ec54 Browse Files
- 分组策略 · c46270a9
  guojuxing authored Jul 04, 2019
  
  c46270a9 Browse Files
- 分组策略 · ea76812c
  guojuxing authored Jul 04, 2019
  
  ea76812c Browse Files
- 分组策略 · 20f37580
  guojuxing authored Jul 04, 2019
  
  20f37580 Browse Files
- 分组策略 · d5c5c254
  guojuxing authored Jul 04, 2019
  
  d5c5c254 Browse Files