Commits · 202411_fix_dup_code · haoban3.0 / haoban-manage3.0 · GitLab

21 Nov, 2024 3 commits
- Merge branch 'master' into 202411_fix_dup_code · 2be2eeb4
  xiongjiangtao authored Nov 21, 2024
  
  2be2eeb4 Browse Files
- 排序 · 6ac33634
  xiongjiangtao authored Nov 21, 2024
  
  6ac33634 Browse Files
- 代码抽取 · d1524163
  xiongjiangtao authored Nov 21, 2024
  
  d1524163 Browse Files
19 Nov, 2024 2 commits
- Merge branch 'feature/xgh/加好友申请标签' into 'master' · 6e3912b3
```
分配时间

See merge request !2314
```
  徐高华 authored Nov 19, 2024
  6e3912b3 Browse Files
- 分配时间 · a3c62e23
  徐高华 authored Nov 19, 2024
  
  a3c62e23 Browse Files
08 Nov, 2024 5 commits
- Merge branch '202411_lost_detail' into 'master' · 21019d0a
```
202411 lost detail

See merge request !2311
```
  xiongjiangtao authored Nov 08, 2024
  21019d0a Browse Files
- Merge branch 'bugfix-20241108' into 'master' · 7f7d1213
```
分页修复

See merge request !2310
```
  王祖波 authored Nov 08, 2024
  7f7d1213 Browse Files
- 分页修复 · 34c341aa
  王祖波 authored Nov 08, 2024
  
  34c341aa Browse Files
- 流失好友 · 1ab0e7a3
  xiongjiangtao authored Nov 08, 2024
  
  1ab0e7a3 Browse Files
- 流失好友 · 870c4e33
  xiongjiangtao authored Nov 08, 2024
  
  870c4e33 Browse Files
06 Nov, 2024 5 commits
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'master' · 9236f7c1
```
Feature 2024 11 05 add store status filter

See merge request !2302
```
  guojx authored Nov 06, 2024
  9236f7c1 Browse Files
- 兼容店长和店员登陆 · 7f6d8705
  guojuxing authored Nov 06, 2024
  
  7f6d8705 Browse Files
- 获取导购管辖门店数量兼容区经和店长店员 · e4c2176b
  guojuxing authored Nov 06, 2024
  
  e4c2176b Browse Files
- Merge branch 'feature/xgh/加好友申请标签' into 'master' · d5293e51
```
群聊

See merge request !2296
```
  徐高华 authored Nov 06, 2024
  d5293e51 Browse Files
- 群聊 · 9c550ff7
  徐高华 authored Nov 06, 2024
  
  9c550ff7 Browse Files
05 Nov, 2024 4 commits
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'master' · f09fe87d
```
Feature 2024 11 05 add store status filter

See merge request !2292
```
  guojx authored Nov 05, 2024
  f09fe87d Browse Files
- Merge branch 'refs/heads/feature-chat-activity' · 897a1469
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatUserMapper.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/ApolloUtils.java
```
  王祖波 authored Nov 05, 2024
  897a1469 Browse Files
- 如果没有权限，则返回空数组 · 4b92dc1a
  guojx authored Nov 05, 2024
  
  4b92dc1a Browse Files
- Merge branch 'feature/xgh/加好友申请标签' into 'master' · 903d4460
```
Feature/xgh/加好友申请标签

See merge request !2289
```
  徐高华 authored Nov 05, 2024
  903d4460 Browse Files
04 Nov, 2024 2 commits
- 增加活码判断是否已经入群的逻辑 · d34e898b
  王祖波 authored Nov 04, 2024
  
  d34e898b Browse Files
- 群聊查询加条件 · 6d63bf9c
  徐高华 authored Nov 04, 2024
  
  6d63bf9c Browse Files
01 Nov, 2024 3 commits
- Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity · f0bce7f4
  xiongjiangtao authored Nov 01, 2024
  
  f0bce7f4 Browse Files
- 修改数据分页参数 · 25b522e2
  xiongjiangtao authored Nov 01, 2024
  
  25b522e2 Browse Files
- 无法邀请自己逻辑修改 · 6fd5a0c7
  王祖波 authored Nov 01, 2024
  
  6fd5a0c7 Browse Files
30 Oct, 2024 6 commits
- 入群时间在访问分享页之前的才算无效入群 · eec213b0
  王祖波 authored Oct 30, 2024
  
  eec213b0 Browse Files
- 社群判断是否有效过滤 · 07472368
  王祖波 authored Oct 30, 2024
  
  07472368 Browse Files
- log · 881e256f
  王祖波 authored Oct 30, 2024
  
  881e256f Browse Files
- 标识字段 · 4187408e
  王祖波 authored Oct 30, 2024
  
  4187408e Browse Files
- test · d5325d3f
  王祖波 authored Oct 30, 2024
  
  d5325d3f Browse Files
- 缓存key · 137bf8de
  王祖波 authored Oct 30, 2024
  
  137bf8de Browse Files
29 Oct, 2024 10 commits
- 合成优化 · 93de13ef
  王祖波 authored Oct 29, 2024
  
  93de13ef Browse Files
- Revert "优化读取" · e0f7d146
```
This reverts commit 590d1c73.
```
  王祖波 authored Oct 29, 2024
  e0f7d146 Browse Files
- log · 10acc4bb
  王祖波 authored Oct 29, 2024
  
  10acc4bb Browse Files
- 优化读取 · 590d1c73
  王祖波 authored Oct 29, 2024
  
  590d1c73 Browse Files
- Merge branch 'feature/1062347-gathering-medal' into 'master' · b8dd7349
```
Feature/1062347 gathering medal

See merge request !2273
```
  xiehongfei authored Oct 29, 2024
  b8dd7349 Browse Files
- Merge branch 'master' into feature/1062347-gathering-medal · 21fe54fc
  erqian authored Oct 29, 2024
  
  21fe54fc Browse Files
- 线程池 · 94fbc213
  王祖波 authored Oct 29, 2024
  
  94fbc213 Browse Files
- 内容分享企微素材使用老的前端合成还是新的后端合成 0老1新 · f4a1601e
  王祖波 authored Oct 29, 2024
  
  f4a1601e Browse Files
- 空指针修改 · 1b2b8aa5
  王祖波 authored Oct 29, 2024
  
  1b2b8aa5 Browse Files
- 动态调整线程池 · 6f8d4f95
  王祖波 authored Oct 29, 2024
  
  6f8d4f95 Browse Files