Commits · 8c5a00c92c6cbe5990f7f1f43b88bb36c83234fd · haoban3.0 / haoban-manage3.0 · GitLab

28 Oct, 2024 12 commits
- 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
25 Oct, 2024 8 commits
- Merge branch 'feature/xgh/导购任务' into 'developer' · 2279bf20
```
在职继承校验

See merge request !2247
```
  徐高华 authored Oct 25, 2024
  2279bf20 Browse Files
- 在职继承校验 · b3fbd7e6
  徐高华 authored Oct 25, 2024
  
  b3fbd7e6 Browse Files
- Merge branch 'feature/xgh/导购任务' into 'developer' · 73ca2f49
```
Feature/xgh/导购任务

See merge request !2246
```
  徐高华 authored Oct 25, 2024
  73ca2f49 Browse Files
- 小红书链接校验 · 9f319e5b
  徐高华 authored Oct 25, 2024
  
  9f319e5b Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 45bc8e8c
  xiongjiangtao authored Oct 25, 2024
  
  45bc8e8c Browse Files
- Merge branch 'feature-chat-activity' into developer · 0cf080b1
  xiongjiangtao authored Oct 25, 2024
  
  0cf080b1 Browse Files
- 统计获取奖励次数 · 324b30d6
  xiongjiangtao authored Oct 25, 2024
  
  324b30d6 Browse Files
- 小红书链接校验 · 3cef5f3f
  徐高华 authored Oct 25, 2024
  
  3cef5f3f Browse Files
23 Oct, 2024 20 commits
- Merge branch 'feature/xgh/11月零散迭代' into 'developer' · 2e2fad23
```
群成员导出

See merge request !2245
```
  徐高华 authored Oct 23, 2024
  2e2fad23 Browse Files
- 群成员导出 · 97bf19df
  徐高华 authored Oct 23, 2024
  
  97bf19df Browse Files
- Merge branch 'feature/xgh/11月零散迭代' into 'developer' · 7c29edde
```
Feature/xgh/11月零散迭代

See merge request !2244
```
  徐高华 authored Oct 23, 2024
  7c29edde Browse Files
- 群成员导出 · 0c1d7c6e
  徐高华 authored Oct 23, 2024
  
  0c1d7c6e Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 25477daa
```
过滤邀请自己

See merge request !2243
```
  王祖波 authored Oct 23, 2024
  25477daa Browse Files
- 过滤邀请自己 · 7aab53f8
  王祖波 authored Oct 23, 2024
  
  7aab53f8 Browse Files
- Merge branch 'feature-chat-activity' into developer · 36992089
  xiongjiangtao authored Oct 23, 2024
  
  36992089 Browse Files
- Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity · 4882fb60
  xiongjiangtao authored Oct 23, 2024
  
  4882fb60 Browse Files
- 统计获取奖励次数 · a8eca211
  xiongjiangtao authored Oct 23, 2024
  
  a8eca211 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · fdbbeb31
```
Feature chat activity

See merge request !2242
```
  王祖波 authored Oct 23, 2024
  fdbbeb31 Browse Files
- Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity · dfa6b159
  王祖波 authored Oct 23, 2024
  
  dfa6b159 Browse Files
- 阶梯奖励批次逻辑 · a5fa7f08
  王祖波 authored Oct 23, 2024
  
  a5fa7f08 Browse Files
- Merge branch 'feature-chat-activity' into developer · 09203e5e
  xiongjiangtao authored Oct 23, 2024
  
  09203e5e Browse Files
- Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity · b456af72
  xiongjiangtao authored Oct 23, 2024
  
  b456af72 Browse Files
- 阶梯奖励 · 32af3620
  xiongjiangtao authored Oct 23, 2024
  
  32af3620 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · a77ef91b
```
Feature chat activity

See merge request !2241
```
  王祖波 authored Oct 23, 2024
  a77ef91b Browse Files
- 阶梯奖励批次逻辑 · af636e87
  王祖波 authored Oct 23, 2024
  
  af636e87 Browse Files
- Merge branch 'feature/xgh/导购任务' into 'master' · abeae912
```
Feature/xgh/导购任务

See merge request !2240
```
  徐高华 authored Oct 23, 2024
  abeae912 Browse Files
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'developer' · b1030da7
```
Feature 2024 11 05 add store status filter

See merge request !2239
```
  guojx authored Oct 23, 2024
  b1030da7 Browse Files
- Merge remote-tracking branch 'origin/feature-2024-11-05-add-store-status-filter'… · d39b29ad
```
Merge remote-tracking branch 'origin/feature-2024-11-05-add-store-status-filter' into feature-2024-11-05-add-store-status-filter
```
  guojx authored Oct 23, 2024
  d39b29ad Browse Files