Commits · 1342aaa693c8c20344d35b07719759c9e32ff37f · base_platform_enterprise / gic-store · GitLab

16 Mar, 2020 4 commits
- 加log · 1342aaa6
  陶光胜 authored Mar 16, 2020
  
  1342aaa6 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · ffce6d5f
  陶光胜 authored Mar 16, 2020
  
  ffce6d5f Browse Files
- 加log · 1dc70e79
  陶光胜 authored Mar 16, 2020
  
  1dc70e79 Browse Files
- 修改返回 · efe7ee43
  zhiwj authored Mar 16, 2020
  
  efe7ee43 Browse Files
12 Mar, 2020 1 commit
- 加log · 03ed8a21
  陶光胜 authored Mar 12, 2020
  
  03ed8a21 Browse Files
11 Mar, 2020 5 commits
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · f3a37a8e
  陶光胜 authored Mar 11, 2020
  
  f3a37a8e Browse Files
- 加log · 880e606e
  陶光胜 authored Mar 11, 2020
  
  880e606e Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 8bf1db6c
  guojuxing authored Mar 11, 2020
  
  8bf1db6c Browse Files
- 门店设置查询自定义字段调整：过滤文本类型的字段，因为放不进ES · be39c854
  guojuxing authored Mar 11, 2020
  
  be39c854 Browse Files
- 修改导购导入 · db5498ea
  zhiwj authored Mar 11, 2020
  
  db5498ea Browse Files
10 Mar, 2020 4 commits
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 007ffcf0
  陶光胜 authored Mar 10, 2020
  
  007ffcf0 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 0f344c32
  zhiwj authored Mar 10, 2020
  
  0f344c32 Browse Files
- 修改门店分组策略 · c2ba4d5e
  zhiwj authored Mar 10, 2020
  
  c2ba4d5e Browse Files
- 默认门店不能编辑 · 2c8ae0bf
  guojuxing authored Mar 10, 2020
  
  2c8ae0bf Browse Files
06 Mar, 2020 2 commits
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · e961f19d
  陶光胜 authored Mar 06, 2020
  
  e961f19d Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · d7caa483
```
# Conflicts:
#	gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
```
  陶光胜 authored Mar 06, 2020
  d7caa483 Browse Files
04 Mar, 2020 7 commits
- 提交门店 · 5a814681
  zhiwj authored Mar 04, 2020
  
  5a814681 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 0671663b
  zhiwj authored Mar 04, 2020
  
  0671663b Browse Files
- 提交门店 · 9a90d510
  zhiwj authored Mar 04, 2020
  
  9a90d510 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 7bbc094d
```
# Conflicts:
#	gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
```
  陶光胜 authored Mar 04, 2020
  7bbc094d Browse Files
- 积分成本主体选择门店接口 · 8d7cb553
  陶光胜 authored Mar 04, 2020
  
  8d7cb553 Browse Files
- 提交门店 · 1af07722
  zhiwj authored Mar 04, 2020
  
  1af07722 Browse Files
- 修改门店标签的传值 · a495487c
  zhiwj authored Mar 04, 2020
  
  a495487c Browse Files
03 Mar, 2020 3 commits
- 修改门店标签的传值 · 6b85c98a
  zhiwj authored Mar 03, 2020
  
  6b85c98a Browse Files
- 修改门店标签的传值 · 8336f56f
  zhiwj authored Mar 03, 2020
  
  8336f56f Browse Files
- 修改门店标签的传值 · 5e99e649
  zhiwj authored Mar 03, 2020
  
  5e99e649 Browse Files
28 Feb, 2020 13 commits
- 修改门店标签bug · 69b4e16b
  zhiwj authored Feb 28, 2020
  
  69b4e16b Browse Files
- 提交门店 · 27ba25f8
  zhiwj authored Feb 28, 2020
  
  27ba25f8 Browse Files
- 提交门店 · 09bd7ca5
  zhiwj authored Feb 28, 2020
  
  09bd7ca5 Browse Files
- 提交门店 · 0d20953e
  zhiwj authored Feb 28, 2020
  
  0d20953e Browse Files
- 提交门店 · 23ccaf3c
  zhiwj authored Feb 28, 2020
  
  23ccaf3c Browse Files
- 提交门店 · 2410ff33
  zhiwj authored Feb 28, 2020
  
  2410ff33 Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 00adb7a3
  zhiwj authored Feb 28, 2020
  
  00adb7a3 Browse Files
- 提交门店 · 5ca9b78a
  zhiwj authored Feb 28, 2020
  
  5ca9b78a Browse Files
- 门店过滤查询修复 · 68dd8ede
  guojuxing authored Feb 28, 2020
  
  68dd8ede Browse Files
- 门店过滤 · 4dbec9ef
  guojuxing authored Feb 28, 2020
  
  4dbec9ef Browse Files
- Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer · 1091e97e
  zhiwj authored Feb 28, 2020
  
  1091e97e Browse Files
- 门店新增修改 · c822282d
  zhiwj authored Feb 28, 2020
  
  c822282d Browse Files
- 门店过滤 · 78364008
  guojuxing authored Feb 28, 2020
  
  78364008 Browse Files
27 Feb, 2020 1 commit
- Merge remote-tracking branch 'origin/developer' into developer · fe932328
  guojuxing authored Feb 27, 2020
  
  fe932328 Browse Files