Commits · 72968cd96a8030b815c755d6536cb5276e41bab9 · base_platform_enterprise / gic-store · GitLab

12 Aug, 2020 11 commits
- Merge branch 'developer' into 'master' · 72968cd9
```
Developer

See merge request !32
```
  陶光胜 authored Aug 12, 2020
  72968cd9 Browse Files
- 门店批量导入修改 · 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 6 commits
- Merge branch 'developer' into 'master' · 67eb3624
```
Developer

See merge request !31
```
  zhiwj authored Aug 07, 2020
  67eb3624 Browse Files
- 修改bug · aaf17695
  zhiwj authored Aug 07, 2020
  
  aaf17695 Browse Files
- 修改bug · be456e6d
  zhiwj authored Aug 07, 2020
  
  be456e6d Browse Files
- 导购门店域添加 · 6715e08a
  zhiwj authored Aug 07, 2020
  
  6715e08a Browse Files
- Merge branch 'developer' into 'master' · 3c5a9dd1
```
Developer

See merge request !30
```
  zhiwj authored Aug 07, 2020
  3c5a9dd1 Browse Files
- 门店es参数添加非空判断 · 62caf571
  zhiwj authored Aug 07, 2020
  
  62caf571 Browse Files
06 Aug, 2020 1 commit
- 店长逻辑修改 · 938ecfba
  zhiwj authored Aug 06, 2020
  
  938ecfba Browse Files
05 Aug, 2020 4 commits
- 店长逻辑修改 · 8afaa480
  zhiwj authored Aug 05, 2020
  
  8afaa480 Browse Files
- 店长逻辑修改 · 7cb42101
  zhiwj authored Aug 05, 2020
  
  7cb42101 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · fb63871b
  zhiwj authored Aug 05, 2020
  
  fb63871b Browse Files
- 店长逻辑修改 · 23d2eea6
  zhiwj authored Aug 05, 2020
  
  23d2eea6 Browse Files
04 Aug, 2020 3 commits
- Merge branch 'developer' into 'master' · 04f6e568
```
Developer

See merge request !29
```
  陶光胜 authored Aug 04, 2020
  04f6e568 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · a4ee6bb7
  陶光胜 authored Aug 04, 2020
  
  a4ee6bb7 Browse Files
- 门店erp导入省市区校验取消 · c0b011f3
  陶光胜 authored Aug 04, 2020
  
  c0b011f3 Browse Files
03 Aug, 2020 3 commits
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 68cbf385
  zhiwj authored Aug 03, 2020
  
  68cbf385 Browse Files
- 给好办添加接口 · 9d59a0f0
  zhiwj authored Aug 03, 2020
  
  9d59a0f0 Browse Files
- 微盟营业时间周日修复 · 0475d3b8
  guojuxing authored Aug 03, 2020
  
  0475d3b8 Browse Files
31 Jul, 2020 3 commits
- Merge branch 'developer' into 'master' · 3b718afb
```
license修改

See merge request !28
```
  陶光胜 authored Jul 31, 2020
  3b718afb Browse Files
- license修改 · acfbd4c7
  guojuxing authored Jul 31, 2020
  
  acfbd4c7 Browse Files
- Merge branch 'developer' into 'master' · be3f2a32
```
areaId countyId

See merge request !27
```
  陶光胜 authored Jul 31, 2020
  be3f2a32 Browse Files
30 Jul, 2020 2 commits
- areaId countyId · 23e4be6f
  zhiwj authored Jul 30, 2020
  
  23e4be6f Browse Files
- Merge branch 'developer' into 'master' · 017b3f35
```
Developer

See merge request !26
```
  陶光胜 authored Jul 30, 2020
  017b3f35 Browse Files