Commits · 81d05d97c330af24392db17b0f65d0d9211761d1 · haoban3.0 / haoban-manage3.0 · GitLab

09 Jun, 2023 5 commits
- Merge branch 'feature-积分商城迁移' into 'developer' · 81d05d97
```
Feature 积分商城迁移

See merge request !1301
```
  徐高华 authored Jun 09, 2023
  81d05d97 Browse Files
- 协商记录 · b18e02f1
  徐高华 authored Jun 09, 2023
  
  b18e02f1 Browse Files
- 订单操作人 · dd0536e8
  徐高华 authored Jun 09, 2023
  
  dd0536e8 Browse Files
- Merge branch 'feature-content3' into developer · 1e62f8a6
  songyinghui authored Jun 09, 2023
  
  1e62f8a6 Browse Files
- feat: 导购佣金消息通知 · 71590e98
  songyinghui authored Jun 09, 2023
  
  71590e98 Browse Files
08 Jun, 2023 5 commits
- test · 65e023dd
  徐高华 authored Jun 08, 2023
  
  65e023dd Browse Files
- Merge branch 'bugfix/2023-06-07' into developer · f169f642
  jinxin authored Jun 08, 2023
  
  f169f642 Browse Files
- 自建应用支持更新agentId · ac993411
  jinxin authored Jun 08, 2023
  
  ac993411 Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-06-07' into developer · c56c1a74
  jinxin authored Jun 08, 2023
  
  c56c1a74 Browse Files
- 自建应用支持更新agentId · fd51b9b5
  jinxin authored Jun 08, 2023
  
  fd51b9b5 Browse Files
07 Jun, 2023 3 commits
- feat 好办导购佣金消息通知 · bccea27d
  songyinghui authored Jun 07, 2023
  
  bccea27d Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-06-07' into developer · 9d21931a
```
# Conflicts:
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffActiveDataVO.java
```
  jinxin authored Jun 07, 2023
  9d21931a Browse Files
- 统计已合并许可账号总数 · e8df7f6f
  jinxin authored Jun 07, 2023
  
  e8df7f6f Browse Files
05 Jun, 2023 15 commits
- Merge branch 'feature/五月二期' into 'master' · b5e8ac2b
```
空指针异常处理

See merge request !1299
```
  jinxin authored Jun 05, 2023
  b5e8ac2b Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 1b23dc18
  jinxin authored Jun 05, 2023
  
  1b23dc18 Browse Files
- 空指针异常处理 · 1b696bdf
  jinxin authored Jun 05, 2023
  
  1b696bdf Browse Files
- Merge branch 'feature-content3' into developer · 1582ed80
  songyinghui authored Jun 05, 2023
  
  1582ed80 Browse Files
- feat: 素材短链分享失败场景 · 8756caf0
  songyinghui authored Jun 05, 2023
  
  8756caf0 Browse Files
- Merge branch 'feature/五月二期' into 'master' · d60363a6
```
创建群

See merge request !1298
```
  徐高华 authored Jun 05, 2023
  d60363a6 Browse Files
- Merge branch 'feature/五月二期' into 'developer' · 91f5049a
```
创建群

See merge request !1297
```
  徐高华 authored Jun 05, 2023
  91f5049a Browse Files
- 创建群 · 9951a956
  徐高华 authored Jun 05, 2023
  
  9951a956 Browse Files
- Merge branch 'feature/五月二期' into 'master' · 70b6e424
```
Feature/五月二期

See merge request !1296
```
  jinxin authored Jun 05, 2023
  70b6e424 Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 0253fe64
  jinxin authored Jun 05, 2023
  
  0253fe64 Browse Files
- 删除外部联系人id为空的数据 · 6af75e46
  jinxin authored Jun 05, 2023
  
  6af75e46 Browse Files
- 删除外部联系人id为空的数据 · fa44f661
  jinxin authored Jun 05, 2023
  
  fa44f661 Browse Files
- Merge branch 'feature/五月二期' into 'master' · 20e6e474
```
Feature/五月二期

See merge request !1295
```
  jinxin authored Jun 05, 2023
  20e6e474 Browse Files
- Merge branch 'feature/五月二期' into developer · 4b3b2e26
  jinxin authored Jun 05, 2023
  
  4b3b2e26 Browse Files
- 判空处理 · e8c7fd5e
  jinxin authored Jun 05, 2023
  
  e8c7fd5e Browse Files
01 Jun, 2023 5 commits
- Merge branch 'bugfix/2023-05-30' into 'master' · 190e5538
```
Bugfix/2023 05 30

See merge request !1294
```
  jinxin authored Jun 01, 2023
  190e5538 Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-05-30' into developer · 874f1cb5
  jinxin authored Jun 01, 2023
  
  874f1cb5 Browse Files
- 查询未完成营销任务数量添加缓存 · 55e96a19
  jinxin authored Jun 01, 2023
  
  55e96a19 Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · 21f518d6
  jinxin authored Jun 01, 2023
  
  21f518d6 Browse Files
- 定时同步企业微信通讯录列表 · a17f473e
  jinxin authored Jun 01, 2023
  
  a17f473e Browse Files
31 May, 2023 7 commits
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · dadeee14
  jinxin authored May 31, 2023
  
  dadeee14 Browse Files
- 定时同步企业微信通讯录列表 · b00b135d
  jinxin authored May 31, 2023
  
  b00b135d Browse Files
- Merge remote-tracking branch 'origin/feature/五月二期' into developer · e89478a2
  jinxin authored May 31, 2023
  
  e89478a2 Browse Files
- 定时同步企业微信通讯录列表 · 4c7bc159
  jinxin authored May 31, 2023
  
  4c7bc159 Browse Files
- Merge branch 'feature/五月二期' into developer · daecbe7c
  jinxin authored May 31, 2023
  
  daecbe7c Browse Files
- 新增是否支持配置回调地址字段 · b99f847f
  jinxin authored May 31, 2023
  
  b99f847f Browse Files
- Merge branch 'feature/五月二期' into developer · 6a69c4f0
  jinxin authored May 31, 2023
  
  6a69c4f0 Browse Files