Commits · 76c0fc0c31e14ede678e99bf29a1c22c6f424e40 · haoban3.0 / haoban-manage3.0 · GitLab

13 Jul, 2022 40 commits
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 76c0fc0c
  徐高华 authored Jul 14, 2022
  
  76c0fc0c Browse Files
- key · ffd4fa91
  徐高华 authored Jul 14, 2022
  
  ffd4fa91 Browse Files
- feat:新增活码查看记录接口 · 5675fffb
  墨竹 authored Jul 13, 2022
  
  5675fffb Browse Files
- feat: 活码批量分组异常返回 · 02a4fce8
  songyinghui authored Jul 13, 2022
  
  02a4fce8 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 3148fd30
  songyinghui authored Jul 13, 2022
  
  3148fd30 Browse Files
- feat: 活码批量分组 · 01764cd3
  songyinghui authored Jul 13, 2022
  
  01764cd3 Browse Files
- 活码 · e183e21f
  徐高华 authored Jul 13, 2022
  
  e183e21f Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · bc4f3641
  guojx authored Jul 13, 2022
  
  bc4f3641 Browse Files
- 引流链接数据接口 · e3c457d7
  guojx authored Jul 13, 2022
  
  e3c457d7 Browse Files
- feat:新增活码统计 · 5963768f
  墨竹 authored Jul 13, 2022
  
  5963768f Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · 53e6e7c3
```
Master xgh 停用功能

See merge request !197
```
  徐高华 authored Jul 13, 2022
  53e6e7c3 Browse Files
- 企微状态 · 11027bf9
  徐高华 authored Jul 13, 2022
  
  11027bf9 Browse Files
- Merge branch 'master_xgh_待开发调整711' into 'master_xgh_停用功能' · 872e2c6e
```
Master xgh 待开发调整711

See merge request !196
```
  徐高华 authored Jul 13, 2022
  872e2c6e Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 8fe65855
  墨竹 authored Jul 13, 2022
  
  8fe65855 Browse Files
- feat:统计修改 · 46662f37
  墨竹 authored Jul 13, 2022
  
  46662f37 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e8dddca6
  guojx authored Jul 13, 2022
  
  e8dddca6 Browse Files
- 引流链接数据接口 · 603c17aa
  guojx authored Jul 13, 2022
  
  603c17aa Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · fc471a56
```
test

See merge request !195
```
  徐高华 authored Jul 13, 2022
  fc471a56 Browse Files
- test · 6323cc99
  徐高华 authored Jul 13, 2022
  
  6323cc99 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer · fc360c67
```
Conflicts:
	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
```
  徐高华 authored Jul 13, 2022
  fc360c67 Browse Files
- 停用好办 · 96c181b6
  徐高华 authored Jul 13, 2022
  
  96c181b6 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer · 0507b69e
  徐高华 authored Jul 13, 2022
  
  0507b69e Browse Files
- test · 6238c85d
  徐高华 authored Jul 13, 2022
  
  6238c85d Browse Files
- Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer · 74fa9450
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java
```
  徐高华 authored Jul 13, 2022
  74fa9450 Browse Files
- ding · 7e2f1426
  徐高华 authored Jul 13, 2022
  
  7e2f1426 Browse Files
- 停用好办 · d24f80b6
  徐高华 authored Jul 13, 2022
  
  d24f80b6 Browse Files
- Merge branch 'master_xgh_停用功能' into 'developer' · 840ab001
```
设置主门店

See merge request !192
```
  徐高华 authored Jul 13, 2022
  840ab001 Browse Files
- 设置主门店 · 4aa574a1
  徐高华 authored Jul 13, 2022
  
  4aa574a1 Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer · 2f347e7b
  徐高华 authored Jul 13, 2022
  
  2f347e7b Browse Files
- Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer · f64db74e
```
Conflicts:
	haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
```
  徐高华 authored Jul 13, 2022
  f64db74e Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ed105128
  guojx authored Jul 13, 2022
  
  ed105128 Browse Files
- 停用 · 2f5dda69
  徐高华 authored Jul 13, 2022
  
  2f5dda69 Browse Files
- 数据组接口 · 88a900d5
  guojx authored Jul 13, 2022
  
  88a900d5 Browse Files
- test · c6289d04
  徐高华 authored Jul 13, 2022
  
  c6289d04 Browse Files
- test · 802d6079
  徐高华 authored Jul 13, 2022
  
  802d6079 Browse Files
- sql · 96dc4383
  徐高华 authored Jul 13, 2022
  
  96dc4383 Browse Files
- sql · 3ae5bdca
  徐高华 authored Jul 13, 2022
  
  3ae5bdca Browse Files
- sql · b9dea395
  徐高华 authored Jul 13, 2022
  
  b9dea395 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer · 690a6cd9
```
Conflicts:
	haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
```
  徐高华 authored Jul 13, 2022
  690a6cd9 Browse Files
- sql · ed3211ef
  徐高华 authored Jul 13, 2022
  
  ed3211ef Browse Files