Commits · 7c29eddecf6dbe2b034ddc344c5adee03bd285a6 · haoban3.0 / haoban-manage3.0 · GitLab

23 Oct, 2024 19 commits
- 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
- 企微概览接口增加门店状态筛选 · d01bf31a
  guojx authored Oct 23, 2024
  
  d01bf31a Browse Files
22 Oct, 2024 11 commits
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'developer' · 5a349e92
```
Feature 2024 11 05 add store status filter

See merge request !2238
```
  王祖波 authored Oct 22, 2024
  5a349e92 Browse Files
- 内容区经管辖门店过滤状态调整 · 8596855a
  王祖波 authored Oct 22, 2024
  
  8596855a Browse Files
- Merge branch 'feature/xgh/导购任务' into 'developer' · db53a5fa
```
参数校验

See merge request !2237
```
  徐高华 authored Oct 22, 2024
  db53a5fa Browse Files
- 参数校验 · 8594675f
  徐高华 authored Oct 22, 2024
  
  8594675f Browse Files
- Merge branch 'feature/xgh/导购任务' into 'developer' · 2b78abb1
```
参数校验

See merge request !2236
```
  徐高华 authored Oct 22, 2024
  2b78abb1 Browse Files
- 参数校验 · cf15d099
  徐高华 authored Oct 22, 2024
  
  cf15d099 Browse Files
- Merge branch 'feature/xgh/导购任务' into developer · af257154
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/offline/OfflinePreController.java
```
  徐高华 authored Oct 22, 2024
  af257154 Browse Files
- 参数校验 · 19915fb0
  徐高华 authored Oct 22, 2024
  
  19915fb0 Browse Files
- Merge branch 'feature/xgh/导购任务' into 'developer' · 15422164
```
会员合并换绑

See merge request !2234
```
  徐高华 authored Oct 22, 2024
  15422164 Browse Files
- 会员合并换绑 · c6e66034
  徐高华 authored Oct 22, 2024
  
  c6e66034 Browse Files
- Merge branch 'feature/xgh/导购任务' into 'developer' · e9bcf0fb
```
Feature/xgh/导购任务

See merge request !2233
```
  徐高华 authored Oct 22, 2024
  e9bcf0fb Browse Files
21 Oct, 2024 10 commits
- Merge branch 'bugfix-20241021' into 'master' · 66cb916f
```
Bugfix 20241021

See merge request !2232
```
  王祖波 authored Oct 21, 2024
  66cb916f Browse Files
- Merge branch 'bugfix-20241021' into 'developer' · b920fb25
```
图片压缩

See merge request !2231
```
  王祖波 authored Oct 21, 2024
  b920fb25 Browse Files
- 图片压缩 · ec742df9
  王祖波 authored Oct 21, 2024
  
  ec742df9 Browse Files
- Merge branch 'bugfix-20241021' into 'developer' · 3dd3ba59
```
图片压缩

See merge request !2230
```
  王祖波 authored Oct 21, 2024
  3dd3ba59 Browse Files
- 图片压缩 · f59ded01
  王祖波 authored Oct 21, 2024
  
  f59ded01 Browse Files
- 导出修改 · 165c3e6f
  xiongjiangtao authored Oct 21, 2024
  
  165c3e6f Browse Files
- Merge branch 'feature-chat-activity' into developer · 73791f7b
  xiongjiangtao authored Oct 21, 2024
  
  73791f7b Browse Files
- 导出修改 · 0f487906
  xiongjiangtao authored Oct 21, 2024
  
  0f487906 Browse Files
- Merge branch 'feature-chat-activity' into developer · 42f713b0
  xiongjiangtao authored Oct 21, 2024
  
  42f713b0 Browse Files
- 导出修改 · 3ac39a5b
  xiongjiangtao authored Oct 21, 2024
  
  3ac39a5b Browse Files