Commits · 7d8bc0bbde81124ac8a4bb1a7656e9a22f1419d9 · haoban3.0 / haoban-manage3.0

28 Dec, 2022 2 commits
- Merge branch 'feature/计费中心-视频' into 'master' · 7d8bc0bb
```
Feature/计费中心 视频

See merge request !784
```
  徐高华 authored Dec 28, 2022
  7d8bc0bb Browse Files
- Merge branch 'master' into 'feature/计费中心-视频' · 1d6635b7
```
# Conflicts:
#   haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  徐高华 authored Dec 28, 2022
  1d6635b7 Browse Files
27 Dec, 2022 1 commit
- 视频费用校验 · 0eb8eab5
  徐高华 authored Dec 27, 2022
  
  0eb8eab5 Browse Files
15 Dec, 2022 2 commits
- Merge branch 'feature-content-pro' into 'master' · e240e151
```
过滤无素材栏目

See merge request !642
```
  王祖波 authored Dec 15, 2022
  e240e151 Browse Files
- 跳转 · 830fcd05
  徐高华 authored Dec 15, 2022
  
  830fcd05 Browse Files
14 Dec, 2022 3 commits
- Merge branch 'bugfix-xgh-12月' into 'master' · 27ce02c2
```
Bugfix xgh 12月

See merge request !625
```
  徐高华 authored Dec 14, 2022
  27ce02c2 Browse Files
- 参数名写错 · 66e398ea
  徐高华 authored Dec 14, 2022
  
  66e398ea Browse Files
- 小程序提审调整 · 19f38393
  徐高华 authored Dec 14, 2022
  
  19f38393 Browse Files
13 Dec, 2022 1 commit
- 过滤无素材栏目 · 42571bd1
  王祖波 authored Dec 13, 2022
  
  42571bd1 Browse Files
12 Dec, 2022 1 commit

Merge remote-tracking branch 'origin/xgh_内容中台' · 3936d81d

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

authored Dec 12, 2022

3936d81d Browse Files

10 Dec, 2022 1 commit
- 上传 · f694f3b6
  徐高华 authored Dec 10, 2022
  
  f694f3b6 Browse Files
08 Dec, 2022 3 commits
- 线下预约通知 · 071eb814
  徐高华 authored Dec 08, 2022
  
  071eb814 Browse Files
- Merge branch 'bugfix-xgh-12月' into 'master' · 4701803b
```
会员代开发查门店不处理主门店

See merge request !556
```
  徐高华 authored Dec 08, 2022
  4701803b Browse Files
- 消息发送 · e6bc1bff
  徐高华 authored Dec 08, 2022
  
  e6bc1bff Browse Files
07 Dec, 2022 5 commits
- 会员代开发查门店不处理主门店 · 966305d2
  徐高华 authored Dec 07, 2022
  
  966305d2 Browse Files
- Merge branch 'feature-2022-12-07-temp' into 'master' · 09d555b2
```
活码名称/code搜索

See merge request !547
```
  guojx authored Dec 07, 2022
  09d555b2 Browse Files
- 活码名称/code搜索 · 880332aa
  guojx authored Nov 24, 2022
  
  880332aa Browse Files
- 上传 · f29cb2ab
  徐高华 authored Dec 07, 2022
  
  f29cb2ab Browse Files
- 企微上传 · 856ac61b
  徐高华 authored Dec 07, 2022
  
  856ac61b Browse Files
01 Dec, 2022 6 commits
- test · 81235af2
  徐高华 authored Dec 01, 2022
  
  81235af2 Browse Files
- 图片异常 · c3aa588d
  徐高华 authored Dec 01, 2022
  
  c3aa588d Browse Files
- test · b7dcf522
  徐高华 authored Dec 01, 2022
  
  b7dcf522 Browse Files
- log · 7bd0e2a4
  徐高华 authored Dec 01, 2022
  
  7bd0e2a4 Browse Files
- test · 48135289
  徐高华 authored Dec 01, 2022
  
  48135289 Browse Files
- 图片返回压缩图 · ff83c1d1
  徐高华 authored Dec 01, 2022
  
  ff83c1d1 Browse Files
28 Nov, 2022 11 commits
- 导购 · 243df1f6
  徐高华 authored Nov 28, 2022
  
  243df1f6 Browse Files
- log · 5e0bff6f
  徐高华 authored Nov 28, 2022
  
  5e0bff6f Browse Files
- Merge branch 'master_xgh_我的客户迭代' into 'master' · 8bcd8c38
```
删除成员

See merge request !486
```
  徐高华 authored Nov 28, 2022
  8bcd8c38 Browse Files
- 删除成员 · e850d7ce
  徐高华 authored Nov 28, 2022
  
  e850d7ce Browse Files
- Merge branch 'master_xgh_我的客户迭代' into 'master' · 7f61cf69
```
Master xgh 我的客户迭代

See merge request !483
```
  徐高华 authored Nov 28, 2022
  7f61cf69 Browse Files
- 成员离职 · 55bb2c6d
  徐高华 authored Nov 28, 2022
  
  55bb2c6d Browse Files
- 素材 · 348a5271
  徐高华 authored Nov 28, 2022
  
  348a5271 Browse Files
- feat: 视频时长 · 6eb324c6
  songyinghui authored Nov 28, 2022
  
  6eb324c6 Browse Files
- 图片 · 6a06e4d5
  徐高华 authored Nov 28, 2022
  
  6a06e4d5 Browse Files
- 视频 · fd539a92
  徐高华 authored Nov 28, 2022
  
  fd539a92 Browse Files
- 上传图片大小限制 · 4150fe8d
  徐高华 authored Nov 28, 2022
  
  4150fe8d Browse Files
25 Nov, 2022 3 commits
- feat: 分页参数当前页返回给前段 · 92020da2
  songyinghui authored Nov 25, 2022
  
  92020da2 Browse Files
- test · 89c68ea4
  徐高华 authored Nov 25, 2022
  
  89c68ea4 Browse Files
- url · 2cf2c628
  徐高华 authored Nov 25, 2022
  
  2cf2c628 Browse Files
24 Nov, 2022 1 commit
- 导购查询 · e5c71efe
  徐高华 authored Nov 24, 2022
  
  e5c71efe Browse Files