Commits · 6c725ebca74a189fc583c7979a1e80ef3e6b579a · haoban3.0 / haoban-manage3.0 · GitLab

29 Oct, 2024 16 commits
- Merge branch 'feature-chat-activity' into 'developer' · 6c725ebc
```
文案

See merge request !2266
```
  王祖波 authored Oct 29, 2024
  6c725ebc Browse Files
- 文案 · d5d03481
  王祖波 authored Oct 29, 2024
  
  d5d03481 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 7ad61a54
```
区分群发和朋友圈

See merge request !2265
```
  王祖波 authored Oct 29, 2024
  7ad61a54 Browse Files
- 区分群发和朋友圈 · 232e0f1d
  王祖波 authored Oct 29, 2024
  
  232e0f1d Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 06e58e6b
```
调整参数

See merge request !2264
```
  王祖波 authored Oct 29, 2024
  06e58e6b Browse Files
- 调整参数 · 0dcd72cb
  王祖波 authored Oct 29, 2024
  
  0dcd72cb Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · aeafa711
```
log

See merge request !2263
```
  王祖波 authored Oct 29, 2024
  aeafa711 Browse Files
- log · 80da8474
  王祖波 authored Oct 29, 2024
  
  80da8474 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · fbde7de5
```
log

See merge request !2262
```
  王祖波 authored Oct 29, 2024
  fbde7de5 Browse Files
- log · ef622d52
  王祖波 authored Oct 29, 2024
  
  ef622d52 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 88ca6ba7
```
缓存key

See merge request !2261
```
  王祖波 authored Oct 29, 2024
  88ca6ba7 Browse Files
- 缓存key · 1b2ae7d6
  王祖波 authored Oct 29, 2024
  
  1b2ae7d6 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 49a14d82
```
释放内存

See merge request !2260
```
  王祖波 authored Oct 29, 2024
  49a14d82 Browse Files
- 释放内存 · 75872a14
  王祖波 authored Oct 29, 2024
  
  75872a14 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 1598747f
```
使用线程池处理

See merge request !2259
```
  王祖波 authored Oct 29, 2024
  1598747f Browse Files
- 使用线程池处理 · dde171dc
  王祖波 authored Oct 29, 2024
  
  dde171dc Browse Files
28 Oct, 2024 24 commits
- Merge branch 'feature/xgh/导购任务' into 'developer' · 10a0b006
```
非空判断

See merge request !2257
```
  徐高华 authored Oct 28, 2024
  10a0b006 Browse Files
- 非空判断 · 4f186c06
  徐高华 authored Oct 28, 2024
  
  4f186c06 Browse Files
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'developer' · d8b17df7
```
Feature 2024 11 05 add store status filter

See merge request !2256
```
  guojx authored Oct 28, 2024
  d8b17df7 Browse Files
- 是否所有门店权限 · 898b8726
  guojx authored Oct 28, 2024
  
  898b8726 Browse Files
- 是否所有门店权限 · 9a89c3d9
  guojx authored Oct 28, 2024
  
  9a89c3d9 Browse Files
- 获取导购管辖门店数量接口支持门店状态筛选 · 021a22a8
  guojx authored Oct 28, 2024
  
  021a22a8 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · ea7b2f50
```
优化黑线问题

See merge request !2255
```
  王祖波 authored Oct 28, 2024
  ea7b2f50 Browse Files
- 优化黑线问题 · 3cbb61d3
  王祖波 authored Oct 28, 2024
  
  3cbb61d3 Browse Files
- Merge branch 'feature/xgh/导购任务' into 'developer' · 0e9ae812
```
小红书

See merge request !2253
```
  徐高华 authored Oct 28, 2024
  0e9ae812 Browse Files
- 小红书 · 3eb310ff
  徐高华 authored Oct 28, 2024
  
  3eb310ff Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · c1d42958
```
优化imageIo读取

See merge request !2252
```
  王祖波 authored Oct 28, 2024
  c1d42958 Browse Files
- 优化imageIo读取 · 30a41d42
  王祖波 authored Oct 28, 2024
  
  30a41d42 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 8c5a00c9
```
log

See merge request !2251
```
  王祖波 authored Oct 28, 2024
  8c5a00c9 Browse Files
- log · f09012d8
  王祖波 authored Oct 28, 2024
  
  f09012d8 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · fa22c67f
```
初始化图像插件

See merge request !2250
```
  王祖波 authored Oct 28, 2024
  fa22c67f Browse Files
- 初始化图像插件 · c2dc43b6
  王祖波 authored Oct 28, 2024
  
  c2dc43b6 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 03ff2b34
```
log

See merge request !2249
```
  王祖波 authored Oct 28, 2024
  03ff2b34 Browse Files
- log · 86b43c40
  王祖波 authored Oct 28, 2024
  
  86b43c40 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · ecbc013c
```
合成图片并生成mediaId

See merge request !2248
```
  王祖波 authored Oct 28, 2024
  ecbc013c Browse Files
- 合成图片并生成mediaId · 0f5ed36a
  王祖波 authored Oct 28, 2024
  
  0f5ed36a Browse Files
- Merge branch 'refs/heads/feature-chat-activity' into developer · 952de406
  王祖波 authored Oct 28, 2024
  
  952de406 Browse Files
- 合成图片并生成mediaId · 5446b449
  王祖波 authored Oct 28, 2024
  
  5446b449 Browse Files
- Merge branch 'refs/heads/feature-chat-activity' into developer · 6898977d
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java
```
  王祖波 authored Oct 28, 2024
  6898977d Browse Files
- 合成图片并生成mediaId · 53082c5f
  王祖波 authored Oct 28, 2024
  
  53082c5f Browse Files