Commits · 6ae4aa59c7c005afbfd9c77f36beb7a9e264fc6f · base_platform_enterprise / gic-store · GitLab

19 Aug, 2020 1 commit
- 门店批量导入修改 · 6ae4aa59
  陶光胜 authored Aug 19, 2020
  
  6ae4aa59 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 10 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
- 门店选择 · 58f5798c
  zhiwj authored Aug 12, 2020
  
  58f5798c Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 8baa75e0
  zhiwj authored Aug 12, 2020
  
  8baa75e0 Browse Files
- 给小康提供门店选择器转storeInfoId的接口 · f8ac3042
  zhiwj authored Aug 12, 2020
  
  f8ac3042 Browse Files
- 门店批量导入修改 · b005fed0
  陶光胜 authored Aug 12, 2020
  
  b005fed0 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 25788963
  陶光胜 authored Aug 12, 2020
  
  25788963 Browse Files
- 门店批量导入修改 · b92aecae
  陶光胜 authored Aug 12, 2020
  
  b92aecae Browse Files
- 门店批量导入修改 · 9b690978
  陶光胜 authored Aug 12, 2020
  
  9b690978 Browse Files
11 Aug, 2020 5 commits
- 门店选择 · d7f4b9cb
  zhiwj authored Aug 11, 2020
  
  d7f4b9cb Browse Files
- 门店选择 · e0130892
  zhiwj authored Aug 11, 2020
  
  e0130892 Browse Files
- 门店选择 · 054e1eb9
  zhiwj authored Aug 11, 2020
  
  054e1eb9 Browse Files
- 门店选择 · 5a2b7497
  zhiwj authored Aug 11, 2020
  
  5a2b7497 Browse Files
- 门店添加筛选 · e30a642a
  zhiwj authored Aug 11, 2020
  
  e30a642a Browse Files
10 Aug, 2020 2 commits
- 修改bug · 441a1ab6
  zhiwj authored Aug 10, 2020
  
  441a1ab6 Browse Files
- 修改bug · 9153f78b
  zhiwj authored Aug 10, 2020
  
  9153f78b Browse Files
07 Aug, 2020 2 commits
- 修改bug · aaf17695
  zhiwj authored Aug 07, 2020
  
  aaf17695 Browse Files
- 修改bug · be456e6d
  zhiwj authored Aug 07, 2020
  
  be456e6d Browse Files