Commits · 16d7b9072077eb451795dbd74db209f9ab74eafd · haoban3.0 / haoban-manage3.0 · GitLab

30 Nov, 2023 25 commits
- Merge branch 'feature-wm' into developer · 16d7b907
  songyinghui authored Nov 30, 2023
  
  16d7b907 Browse Files
- feature: 会员订单写入数据组 · c49632a3
  songyinghui authored Nov 30, 2023
  
  c49632a3 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · 3d10310f
```
如果前端传了门店id，后端不再处理

See merge request !1570
```
  guojx authored Nov 30, 2023
  3d10310f Browse Files
- 如果前端传了门店id，后端不再处理 · 114b3bfb
  guojx authored Nov 30, 2023
  
  114b3bfb Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · ab046ea6
```
渠道权限修复

See merge request !1569
```
  guojx authored Nov 30, 2023
  ab046ea6 Browse Files
- title修改 · 157125fb
  王祖波 authored Nov 30, 2023
  
  157125fb Browse Files
- 渠道权限修复 · ea66f3df
  guojx authored Nov 30, 2023
  
  ea66f3df Browse Files
- Merge branch 'feature-wm' into developer · 5315850d
  王祖波 authored Nov 30, 2023
  
  5315850d Browse Files
- Merge remote-tracking branch 'origin/feature-wm' into feature-wm · 3e64c903
  王祖波 authored Nov 30, 2023
  
  3e64c903 Browse Files
- 素材详情接口修改 · d72ec81a
  王祖波 authored Nov 30, 2023
  
  d72ec81a Browse Files
- Merge branch 'feature-wm' into developer · 72eb9a84
  songyinghui authored Nov 30, 2023
  
  72eb9a84 Browse Files
- feature: 调试 · ac45ca4a
  songyinghui authored Nov 30, 2023
  
  ac45ca4a Browse Files
- Merge branch 'feature-wm' into developer · 5078031d
  songyinghui authored Nov 30, 2023
  
  5078031d Browse Files
- feature: 加锁前置 · cb1032c8
  songyinghui authored Nov 30, 2023
  
  cb1032c8 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · f3630610
```
企业id

See merge request !1568
```
  guojx authored Nov 30, 2023
  f3630610 Browse Files
- 企业id · d6a631f3
  guojx authored Nov 30, 2023
  
  d6a631f3 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · 96e5c1dd
```
企业id

See merge request !1567
```
  guojx authored Nov 30, 2023
  96e5c1dd Browse Files
- 企业id · 0110a3b3
  guojx authored Nov 30, 2023
  
  0110a3b3 Browse Files
- 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 15 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