Commits · 651c89fe6248e78d5bf3540b3a3d048e17468e68 · haoban3.0 / haoban-manage3.0 · GitLab

14 Nov, 2024 2 commits
- Merge branch 'feature/xgh/11月零散迭代' into 'developer' · 651c89fe
```
预约

See merge request !2312
```
  徐高华 authored Nov 14, 2024
  651c89fe Browse Files
- 预约 · 19f7f317
  徐高华 authored Nov 14, 2024
  
  19f7f317 Browse Files
08 Nov, 2024 6 commits
- Merge branch 'bugfix-20241108' into 'developer' · 67f000c3
```
分页修复

See merge request !2309
```
  王祖波 authored Nov 08, 2024
  67f000c3 Browse Files
- 分页修复 · 34c341aa
  王祖波 authored Nov 08, 2024
  
  34c341aa Browse Files
- Merge branch '202411_lost_detail' into developer · 1d800dd9
  xiongjiangtao authored Nov 08, 2024
  
  1d800dd9 Browse Files
- 流失好友 · 1ab0e7a3
  xiongjiangtao authored Nov 08, 2024
  
  1ab0e7a3 Browse Files
- Merge branch '202411_lost_detail' into developer · fbb50f75
  xiongjiangtao authored Nov 08, 2024
  
  fbb50f75 Browse Files
- 流失好友 · 870c4e33
  xiongjiangtao authored Nov 08, 2024
  
  870c4e33 Browse Files
06 Nov, 2024 25 commits
- Merge branch 'feature-chat-activity' into 'developer' · 81cf3cd7
```
字体更换

See merge request !2308
```
  王祖波 authored Nov 06, 2024
  81cf3cd7 Browse Files
- 字体更换 · ee897278
  王祖波 authored Nov 06, 2024
  
  ee897278 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · dab56e0a
```
字体更换

See merge request !2307
```
  王祖波 authored Nov 06, 2024
  dab56e0a Browse Files
- 字体更换 · 26007824
  王祖波 authored Nov 06, 2024
  
  26007824 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 9b7d17d9
```
字体更换

See merge request !2306
```
  王祖波 authored Nov 06, 2024
  9b7d17d9 Browse Files
- 字体更换 · c3042b92
  王祖波 authored Nov 06, 2024
  
  c3042b92 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 4d41f624
```
字体更换

See merge request !2305
```
  王祖波 authored Nov 06, 2024
  4d41f624 Browse Files
- 字体更换 · 34021852
  王祖波 authored Nov 06, 2024
  
  34021852 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 68128fba
```
字体更换

See merge request !2304
```
  王祖波 authored Nov 06, 2024
  68128fba Browse Files
- 字体更换 · 75d8aa0b
  王祖波 authored Nov 06, 2024
  
  75d8aa0b Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 24112d4e
```
字体更换

See merge request !2303
```
  王祖波 authored Nov 06, 2024
  24112d4e Browse Files
- 字体更换 · 6586607e
  王祖波 authored Nov 06, 2024
  
  6586607e Browse Files
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'developer' · 4fe9cdbd
```
兼容店长和店员登陆

See merge request !2301
```
  guojx authored Nov 06, 2024
  4fe9cdbd Browse Files
- 兼容店长和店员登陆 · 7f6d8705
  guojuxing authored Nov 06, 2024
  
  7f6d8705 Browse Files
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'developer' · 9339b43c
```
获取导购管辖门店数量兼容区经和店长店员

See merge request !2300
```
  guojx authored Nov 06, 2024
  9339b43c Browse Files
- 获取导购管辖门店数量兼容区经和店长店员 · e4c2176b
  guojuxing authored Nov 06, 2024
  
  e4c2176b Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · da2406da
```
字体更换

See merge request !2299
```
  王祖波 authored Nov 06, 2024
  da2406da Browse Files
- 字体更换 · 39baa146
  王祖波 authored Nov 06, 2024
  
  39baa146 Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 869d96ca
```
字体更换

See merge request !2298
```
  王祖波 authored Nov 06, 2024
  869d96ca Browse Files
- 字体更换 · 4046f1cf
  王祖波 authored Nov 06, 2024
  
  4046f1cf Browse Files
- Merge branch 'feature-chat-activity' into 'developer' · 3bdfab77
```
字体更换

See merge request !2297
```
  王祖波 authored Nov 06, 2024
  3bdfab77 Browse Files
- 字体更换 · 364c2cde
  王祖波 authored Nov 06, 2024
  
  364c2cde Browse Files
- Merge branch 'feature/xgh/加好友申请标签' into 'master' · d5293e51
```
群聊

See merge request !2296
```
  徐高华 authored Nov 06, 2024
  d5293e51 Browse Files
- Merge branch 'feature/xgh/加好友申请标签' into 'developer' · 012bdbc9
```
群聊

See merge request !2295
```
  徐高华 authored Nov 06, 2024
  012bdbc9 Browse Files
- 群聊 · 9c550ff7
  徐高华 authored Nov 06, 2024
  
  9c550ff7 Browse Files
05 Nov, 2024 7 commits
- Merge branch 'feature-chat-activity' into 'developer' · 94a6cf49
```
Revert "字体更换"

See merge request !2294
```
  王祖波 authored Nov 05, 2024
  94a6cf49 Browse Files
- Revert "字体更换" · 8a1c8635
```
This reverts commit 18117e1a.
```
  王祖波 authored Nov 05, 2024
  8a1c8635 Browse Files
- Merge branch 'refs/heads/feature-chat-activity' into developer · 02cf1260
  王祖波 authored Nov 05, 2024
  
  02cf1260 Browse Files
- 字体更换 · 18117e1a
  王祖波 authored Nov 05, 2024
  
  18117e1a Browse Files
- 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
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'developer' · e137b29d
```
如果没有权限，则返回空数组

See merge request !2290
```
  guojx authored Nov 05, 2024
  e137b29d Browse Files