Commits · a7e2470047e34e98b58fb5aa4f4378dac3b251b8 · haoban3.0 / haoban-manage3.0 · GitLab

30 Nov, 2023 7 commits
- Merge branch 'feature-2023-11-cloud' into 'developer' · a7e24700
```
Feature 2023 11 cloud

See merge request !1566
```
  guojx authored Nov 30, 2023
  a7e24700 Browse Files
- 趋势图 · 5a23f2bd
  guojx authored Nov 30, 2023
  
  5a23f2bd Browse Files
- 企业id · 0970f50f
  guojx authored Nov 30, 2023
  
  0970f50f Browse Files
- 趋势图 · 9d949d54
  guojx authored Nov 30, 2023
  
  9d949d54 Browse Files
- Merge branch 'feature-2023-11-cloud' into developer · a53c38a8
```
# Conflicts:
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  guojx authored Nov 30, 2023
  a53c38a8 Browse Files
- 趋势图 · 632beb12
  guojx authored Nov 30, 2023
  
  632beb12 Browse Files
- 趋势图 · 194e9060
  guojx authored Nov 30, 2023
  
  194e9060 Browse Files
29 Nov, 2023 16 commits
- Merge branch 'feature-2023-11-cloud' into 'developer' · 5e7c03a6
```
Feature 2023 11 cloud

See merge request !1564
```
  guojx authored Nov 29, 2023
  5e7c03a6 Browse Files
- Merge remote-tracking branch 'origin/feature-2023-11-cloud' into feature-2023-11-cloud · e89082f9
  guojx authored Nov 29, 2023
  
  e89082f9 Browse Files
- 接口修复 · ab00add3
  guojx authored Nov 29, 2023
  
  ab00add3 Browse Files
- Merge branch 'feature-wm' into developer · b82e5f0f
  王祖波 authored Nov 29, 2023
  
  b82e5f0f Browse Files
- 素材详情接口修改 · e8429875
  王祖波 authored Nov 29, 2023
  
  e8429875 Browse Files
- Merge branch 'feature-wm' into developer · 38a1f6b6
  王祖波 authored Nov 29, 2023
  
  38a1f6b6 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 38ad8e6c
  王祖波 authored Nov 29, 2023
  
  38ad8e6c Browse Files
- Merge remote-tracking branch 'origin/feature-wm' into feature-wm · aa080634
  王祖波 authored Nov 29, 2023
  
  aa080634 Browse Files
- vo · 98945a14
  王祖波 authored Nov 29, 2023
  
  98945a14 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 9 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