Commits · 3b9926c678afc68523d4ca795d0bc9ababd0c868 · haoban3.0 / haoban-manage3.0 · GitLab

12 Jun, 2023 7 commits
- Merge branch 'feature/五月二期' into 'developer' · 3b9926c6
```
好友查询

See merge request !1306
```
  徐高华 authored Jun 12, 2023
  3b9926c6 Browse Files
- Merge branch 'feature-2023-06-目标配置' into 'developer' · 4e9217cf
```
路由修复

See merge request !1305
```
  guojx authored Jun 12, 2023
  4e9217cf Browse Files
- 路由修复 · 81b180e2
  guojx authored Jun 12, 2023
  
  81b180e2 Browse Files
- 好友查询 · 2b5a2950
  徐高华 authored Jun 12, 2023
  
  2b5a2950 Browse Files
- Merge branch 'feature-2023-06-目标配置' into developer · 0b360d87
```
# Conflicts:
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java
```
  guojx authored Jun 12, 2023
  0b360d87 Browse Files
- 类的文案调整 · fe945f4c
  guojx authored Jun 12, 2023
  
  fe945f4c Browse Files
- 门店目标跟进正式版 · 44196b14
  guojx authored Jun 12, 2023
  
  44196b14 Browse Files
11 Jun, 2023 2 commits
- Merge branch 'feature-content3' into developer · 69d6aa19
  王祖波 authored Jun 11, 2023
  
  69d6aa19 Browse Files
- 提现通知 · a4958369
  王祖波 authored Jun 11, 2023
  
  a4958369 Browse Files
09 Jun, 2023 11 commits
- Merge branch 'bugfix/2023-06-07' into 'master' · cab7d4ec
```
获取部门成员超时处理

See merge request !1303
```
  jinxin authored Jun 09, 2023
  cab7d4ec Browse Files
- 获取部门成员超时处理 · a8123cd8
  jinxin authored Jun 09, 2023
  
  a8123cd8 Browse Files
- feat: 区经角色不发送消息 · fb89eb2b
  songyinghui authored Jun 09, 2023
  
  fb89eb2b Browse Files
- Merge branch 'bugfix/2023-06-07' into 'master' · 472f1d02
```
许可总数需要算上已合并的数量

See merge request !1302
```
  jinxin authored Jun 09, 2023
  472f1d02 Browse Files
- Merge remote-tracking branch 'origin/bugfix/2023-06-07' into developer · ded63d7a
  jinxin authored Jun 09, 2023
  
  ded63d7a Browse Files
- 许可总数需要算上已合并的数量 · 5b3b7b72
  jinxin authored Jun 09, 2023
  
  5b3b7b72 Browse Files
- 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 7 commits
- Merge branch 'bugfix/2023-06-07' into 'master' · 79b69ada
```
Bugfix/2023 06 07

See merge request !1300
```
  jinxin authored Jun 08, 2023
  79b69ada Browse Files
- TEST · 3ae18ab5
  徐高华 authored Jun 08, 2023
  
  3ae18ab5 Browse Files
- 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 10 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