Commits · 0edb048f2481a4ee48c29c206df9f816cacfc124 · base_platform_enterprise / gic-store · GitLab

21 Aug, 2020 4 commits
- Merge remote-tracking branch 'origin/developer' into developer · 0edb048f
  zhiwj authored Aug 21, 2020
  
  0edb048f Browse Files
- 门店搜索 · 6a312358
  zhiwj authored Aug 21, 2020
  
  6a312358 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 2d43f52b
  陶光胜 authored Aug 21, 2020
  
  2d43f52b Browse Files
- 门店批量导入修改 · 127cc2f0
  陶光胜 authored Aug 21, 2020
  
  127cc2f0 Browse Files
20 Aug, 2020 4 commits
- 会员处理进度条 · 792fb5a8
  zhiwj authored Aug 20, 2020
  
  792fb5a8 Browse Files
- 会员处理进度条 · 2ea20328
  zhiwj authored Aug 20, 2020
  
  2ea20328 Browse Files
- 修改导购同步店长并发问题 · 6c2e4f9c
  zhiwj authored Aug 20, 2020
  
  6c2e4f9c Browse Files
- 修改导购同步店长并发问题 · 93b00bfc
  zhiwj authored Aug 20, 2020
  
  93b00bfc Browse Files
19 Aug, 2020 9 commits
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 661448ad
  zhiwj authored Aug 19, 2020
  
  661448ad Browse Files
- 调整门店排序 · 5fa76234
  zhiwj authored Aug 19, 2020
  
  5fa76234 Browse Files
- 修改文案 · 06c4f43f
  zhiwj authored Aug 19, 2020
  
  06c4f43f Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 8b903107
  陶光胜 authored Aug 19, 2020
  
  8b903107 Browse Files
- 门店批量导入修改 · 6ae4aa59
  陶光胜 authored Aug 19, 2020
  
  6ae4aa59 Browse Files
- 调整门店排序 · 42c9eca5
  zhiwj authored Aug 19, 2020
  
  42c9eca5 Browse Files
- 调整门店排序 · d8da918a
  zhiwj authored Aug 19, 2020
  
  d8da918a Browse Files
- 去掉导购名称重复的限制 · 7d1a951b
  zhiwj authored Aug 19, 2020
  
  7d1a951b Browse Files
- 添加经纬度的转换 · da2c0a20
  zhiwj authored Aug 19, 2020
  
  da2c0a20 Browse Files
18 Aug, 2020 4 commits
- 添加接口 · e97937fe
  zhiwj authored Aug 18, 2020
  
  e97937fe Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 67831057
  guojuxing authored Aug 18, 2020
  
  67831057 Browse Files
- 新增门店启用策略修改：允许条件为空，即所有门店 · 254245fb
  guojuxing authored Aug 18, 2020
  
  254245fb Browse Files
- 店招品牌 · a5a3664a
  zhiwj authored Aug 18, 2020
  
  a5a3664a Browse Files
17 Aug, 2020 8 commits
- 门店批量导入修改 · 80141798
  陶光胜 authored Aug 17, 2020
  
  80141798 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 60c863f7
  陶光胜 authored Aug 17, 2020
  
  60c863f7 Browse Files
- 门店批量导入修改 · ca1f264a
  陶光胜 authored Aug 17, 2020
  
  ca1f264a Browse Files
- 同步添加店招品牌 · b730d7d9
  zhiwj authored Aug 17, 2020
  
  b730d7d9 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · e97f4e89
```
# Conflicts:
#	gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
```
  zhiwj authored Aug 17, 2020
  e97f4e89 Browse Files
- 门店同步添加店招品牌 · 713bca0c
  zhiwj authored Aug 17, 2020
  
  713bca0c Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 50fd329d
  陶光胜 authored Aug 17, 2020
  
  50fd329d Browse Files
- 门店批量导入修改 · 76805421
  陶光胜 authored Aug 17, 2020
  
  76805421 Browse Files
14 Aug, 2020 2 commits
- storeInfoId和storeId的修复 · eb23ccaa
  zhiwj authored Aug 14, 2020
  
  eb23ccaa Browse Files
- bug · 92d56c02
  zhiwj authored Aug 14, 2020
  
  92d56c02 Browse Files
13 Aug, 2020 6 commits
- bug · 5d5053d4
  zhiwj authored Aug 13, 2020
  
  5d5053d4 Browse Files
- bug · 1e485879
  zhiwj authored Aug 13, 2020
  
  1e485879 Browse Files
- bug · 3b4bb894
  zhiwj authored Aug 13, 2020
  
  3b4bb894 Browse Files
- 资料完善 · 8fd89639
  zhiwj authored Aug 13, 2020
  
  8fd89639 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · bae3bdbd
  zhiwj authored Aug 13, 2020
  
  bae3bdbd Browse Files
- 给会员组通知 · c8dfff46
  zhiwj authored Aug 13, 2020
  
  c8dfff46 Browse Files
12 Aug, 2020 3 commits
- 门店批量导入修改 · b72b2316
  陶光胜 authored Aug 12, 2020
  
  b72b2316 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 2791e573
```
 Conflicts:
	gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java
```
  陶光胜 authored Aug 12, 2020
  2791e573 Browse Files
- 门店批量导入修改 · d4512b74
  陶光胜 authored Aug 12, 2020
  
  d4512b74 Browse Files