Commits · 897a146921bdb8ff809b87e783463839bbd9d0ff · haoban3.0 / haoban-manage3.0

05 Nov, 2024 2 commits

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

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 21 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
- test · b3e11c5c
  王祖波 authored Oct 29, 2024
  
  b3e11c5c Browse Files
- 批量接口 · 8a6510ac
  王祖波 authored Oct 29, 2024
  
  8a6510ac Browse Files
- 优化 · c847a7c7
  王祖波 authored Oct 29, 2024
  
  c847a7c7 Browse Files
- 文案 · d5d03481
  王祖波 authored Oct 29, 2024
  
  d5d03481 Browse Files
- 区分群发和朋友圈 · 232e0f1d
  王祖波 authored Oct 29, 2024
  
  232e0f1d Browse Files
- 调整参数 · 0dcd72cb
  王祖波 authored Oct 29, 2024
  
  0dcd72cb Browse Files
- log · 80da8474
  王祖波 authored Oct 29, 2024
  
  80da8474 Browse Files
- log · ef622d52
  王祖波 authored Oct 29, 2024
  
  ef622d52 Browse Files
- 缓存key · 1b2ae7d6
  王祖波 authored Oct 29, 2024
  
  1b2ae7d6 Browse Files
- 释放内存 · 75872a14
  王祖波 authored Oct 29, 2024
  
  75872a14 Browse Files
- 使用线程池处理 · dde171dc
  王祖波 authored Oct 29, 2024
  
  dde171dc Browse Files
28 Oct, 2024 6 commits
- Merge branch 'feature/xgh/导购任务' into 'master' · ea1aaf85
```
非空判断

See merge request !2258
```
  徐高华 authored Oct 28, 2024
  ea1aaf85 Browse Files
- 非空判断 · 4f186c06
  徐高华 authored Oct 28, 2024
  
  4f186c06 Browse Files
- Merge branch 'feature/xgh/导购任务' into 'master' · 1e17fb1e
```
Feature/xgh/导购任务

See merge request !2254
```
  徐高华 authored Oct 28, 2024
  1e17fb1e Browse Files
- 优化黑线问题 · 3cbb61d3
  王祖波 authored Oct 28, 2024
  
  3cbb61d3 Browse Files
- 小红书 · 3eb310ff
  徐高华 authored Oct 28, 2024
  
  3eb310ff Browse Files
- 优化imageIo读取 · 30a41d42
  王祖波 authored Oct 28, 2024
  
  30a41d42 Browse Files