Commits · 38ad8e6caa370739c4fb27f5f084d135cf15d890 · haoban3.0 / haoban-manage3.0 · GitLab

29 Nov, 2023 8 commits
- Merge remote-tracking branch 'origin/developer' into developer · 38ad8e6c
  王祖波 authored Nov 29, 2023
  
  38ad8e6c Browse Files
- Merge branch 'feature-wm' into developer · 3f77ae33
```
# Conflicts:
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  songyinghui authored Nov 29, 2023
  3f77ae33 Browse Files
- feature: 好办对接微盟 · 7ce721d6
  songyinghui authored Nov 29, 2023
  
  7ce721d6 Browse Files
- Merge branch 'feature-wm' into developer · 07ce3db0
  songyinghui authored Nov 29, 2023
  
  07ce3db0 Browse Files
- feature: 素材落地页 · 7fa70ca2
  songyinghui authored Nov 29, 2023
  
  7fa70ca2 Browse Files
- Merge branch 'feature-wm' into developer · 0709a961
  songyinghui authored Nov 29, 2023
  
  0709a961 Browse Files
- Merge branch 'feature-wm' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-wm · 34d8b8a8
  songyinghui authored Nov 29, 2023
  
  34d8b8a8 Browse Files
- feature: 内容账号 · f42f8d05
  songyinghui authored Nov 29, 2023
  
  f42f8d05 Browse Files
28 Nov, 2023 2 commits
- Merge branch 'feature-wm' into developer · e38208c6
  王祖波 authored Nov 28, 2023
  
  e38208c6 Browse Files
- 关联微盟商品 · bc640b75
  王祖波 authored Nov 28, 2023
  
  bc640b75 Browse Files
27 Nov, 2023 2 commits
- Merge branch 'feature-2023-11-cloud' into 'developer' · fb285fb6
```
添加企业微信，好办消息

See merge request !1562
```
  wangwei authored Nov 28, 2023
  fb285fb6 Browse Files
- 添加企业微信，好办消息 · eba1ed8b
  alex authored Nov 28, 2023
  
  eba1ed8b Browse Files
25 Nov, 2023 4 commits
- Merge branch 'feature-2023-11-cloud' into 'developer' · 50721fc0
```
渠道适配数据字段

See merge request !1561
```
  guojx authored Nov 25, 2023
  50721fc0 Browse Files
- 渠道适配数据字段 · 13f3fcf6
  guojx authored Nov 25, 2023
  
  13f3fcf6 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · af907a4b
```
会员封装数据

See merge request !1560
```
  guojx authored Nov 25, 2023
  af907a4b Browse Files
- 会员封装数据 · 9c9bec82
  guojx authored Nov 25, 2023
  
  9c9bec82 Browse Files
24 Nov, 2023 13 commits
- Merge branch 'feature/202310月零散迭代' into 'developer' · 5efc7cf6
```
群发

See merge request !1558
```
  徐高华 authored Nov 24, 2023
  5efc7cf6 Browse Files
- 群发 · d4ac8631
  徐高华 authored Nov 24, 2023
  
  d4ac8631 Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · 5fe52d87
```
新增店员

See merge request !1557
```
  徐高华 authored Nov 24, 2023
  5fe52d87 Browse Files
- 新增店员 · 7c8f1c7d
  徐高华 authored Nov 24, 2023
  
  7c8f1c7d Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · 9d9bf982
```
Feature/202310月零散迭代

See merge request !1556
```
  徐高华 authored Nov 24, 2023
  9d9bf982 Browse Files
- 群群发 · e5dcff9e
  徐高华 authored Nov 24, 2023
  
  e5dcff9e Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · bc2e89db
```
渠道字典数据

See merge request !1555
```
  guojx authored Nov 24, 2023
  bc2e89db Browse Files
- 新增店员 · 8de16e67
  徐高华 authored Nov 24, 2023
  
  8de16e67 Browse Files
- 渠道字典数据 · 91ad61dc
  guojx authored Nov 24, 2023
  
  91ad61dc Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · b435672f
```
数据接口修复

See merge request !1554
```
  guojx authored Nov 24, 2023
  b435672f Browse Files
- 数据接口修复 · 9dd83652
  guojx authored Nov 24, 2023
  
  9dd83652 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · 1b424aa2
```
渠道字典数据

See merge request !1553
```
  guojx authored Nov 24, 2023
  1b424aa2 Browse Files
- 渠道字典数据 · e5617289
  guojx authored Nov 24, 2023
  
  e5617289 Browse Files
23 Nov, 2023 11 commits
- Merge branch 'feature/202310月零散迭代' into 'master' · 3f0eccfc
```
Feature/202310月零散迭代

See merge request !1552
```
  徐高华 authored Nov 24, 2023
  3f0eccfc Browse Files
- SQL · 43e046a9
  徐高华 authored Nov 24, 2023
  
  43e046a9 Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · 3e68a3b9
```
新增

See merge request !1551
```
  徐高华 authored Nov 23, 2023
  3e68a3b9 Browse Files
- 新增 · dc6729ad
  徐高华 authored Nov 23, 2023
  
  dc6729ad Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · 2fb58b95
```
超管

See merge request !1550
```
  徐高华 authored Nov 23, 2023
  2fb58b95 Browse Files
- Merge branch 'feature/202310月零散迭代' into 'master' · 8149d115
```
超管

See merge request !1549
```
  徐高华 authored Nov 23, 2023
  8149d115 Browse Files
- 超管 · 1f50ee01
  徐高华 authored Nov 23, 2023
  
  1f50ee01 Browse Files
- Merge branch 'feature/202310月零散迭代' into 'master' · 1d8d4df0
```
Feature/202310月零散迭代

See merge request !1548
```
  徐高华 authored Nov 23, 2023
  1d8d4df0 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · 5d30c89e
```
指标字典列表调整

See merge request !1547
```
  guojx authored Nov 23, 2023
  5d30c89e Browse Files
- 指标字典列表调整 · 6ad83167
  guojx authored Nov 23, 2023
  
  6ad83167 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · 36aa9874
```
数据通用接口&指标

See merge request !1546
```
  guojx authored Nov 23, 2023
  36aa9874 Browse Files