Commits · 791c534f769a1942e68c65335cfe4c9f1ef43b7a · base_platform_enterprise / gic-store · GitLab

24 Aug, 2020 8 commits
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 791c534f
  陶光胜 authored Aug 24, 2020
  
  791c534f Browse Files
- 门店批量导入修改 · f6f346d1
  陶光胜 authored Aug 24, 2020
  
  f6f346d1 Browse Files
- 门店代码修改 · 2f7cf03a
  zhiwj authored Aug 24, 2020
  
  2f7cf03a Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 167a4303
  zhiwj authored Aug 24, 2020
  
  167a4303 Browse Files
- 门店代码修改 · 27f20da5
  zhiwj authored Aug 24, 2020
  
  27f20da5 Browse Files
- 门店批量导入修改 · 38ae55ab
  陶光胜 authored Aug 24, 2020
  
  38ae55ab Browse Files
- 门店bug修改 · a58f3106
  zhiwj authored Aug 24, 2020
  
  a58f3106 Browse Files
- 门店bug修改 · 7c5d3d7f
  zhiwj authored Aug 24, 2020
  
  7c5d3d7f Browse Files
21 Aug, 2020 7 commits
- 转移会员 · 894250bb
  zhiwj authored Aug 21, 2020
  
  894250bb Browse Files
- 转移会员 · 3e8a70ea
  zhiwj authored Aug 21, 2020
  
  3e8a70ea Browse Files
- 门店搜索 · 52d73afc
  zhiwj authored Aug 21, 2020
  
  52d73afc Browse Files
- 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