Commits · df827f965628df495a734b8ca70f57dc10bd42f3 · haoban3.0 / haoban-manage3.0 · GitLab

26 Nov, 2024 2 commits
- Merge branch 'master' into feature/bsl_hm_modify · df827f96
  erqian authored Nov 26, 2024
  
  df827f96 Browse Files
- Merge branch 'feature-chat-activity' into 'master' · f3a84263
```
Feature chat activity

See merge request !2317
```
  王祖波 authored Nov 26, 2024
  f3a84263 Browse Files
22 Nov, 2024 4 commits
- fix：修改堡狮龙群活码只展示带骑行名称的 · 7133dd40
  erqian authored Nov 22, 2024
  
  7133dd40 Browse Files
- fix：修改堡狮龙群活码只展示带骑行名称的 · 266311ca
  erqian authored Nov 22, 2024
  
  266311ca Browse Files
- fix：修改堡狮龙群活码只展示带骑行名称的 · 386d55be
  erqian authored Nov 22, 2024
  
  386d55be Browse Files
- fix：修改堡狮龙群活码只展示带骑行名称的 · 4f453dcf
  erqian authored Nov 22, 2024
  
  4f453dcf Browse Files
21 Nov, 2024 4 commits
- Merge branch '202411_fix_dup_code' into 'master' · 267edf59
```
202411 fix dup code

See merge request !2315
```
  xiongjiangtao authored Nov 21, 2024
  267edf59 Browse Files
- Merge branch 'master' into 202411_fix_dup_code · 2be2eeb4
  xiongjiangtao authored Nov 21, 2024
  
  2be2eeb4 Browse Files
- 排序 · 6ac33634
  xiongjiangtao authored Nov 21, 2024
  
  6ac33634 Browse Files
- 代码抽取 · d1524163
  xiongjiangtao authored Nov 21, 2024
  
  d1524163 Browse Files
19 Nov, 2024 2 commits
- Merge branch 'feature/xgh/加好友申请标签' into 'master' · 6e3912b3
```
分配时间

See merge request !2314
```
  徐高华 authored Nov 19, 2024
  6e3912b3 Browse Files
- 分配时间 · a3c62e23
  徐高华 authored Nov 19, 2024
  
  a3c62e23 Browse Files
08 Nov, 2024 5 commits
- Merge branch '202411_lost_detail' into 'master' · 21019d0a
```
202411 lost detail

See merge request !2311
```
  xiongjiangtao authored Nov 08, 2024
  21019d0a Browse Files
- Merge branch 'bugfix-20241108' into 'master' · 7f7d1213
```
分页修复

See merge request !2310
```
  王祖波 authored Nov 08, 2024
  7f7d1213 Browse Files
- 分页修复 · 34c341aa
  王祖波 authored Nov 08, 2024
  
  34c341aa Browse Files
- 流失好友 · 1ab0e7a3
  xiongjiangtao authored Nov 08, 2024
  
  1ab0e7a3 Browse Files
- 流失好友 · 870c4e33
  xiongjiangtao authored Nov 08, 2024
  
  870c4e33 Browse Files
06 Nov, 2024 14 commits
- 字体更换 · ee897278
  王祖波 authored Nov 06, 2024
  
  ee897278 Browse Files
- 字体更换 · 26007824
  王祖波 authored Nov 06, 2024
  
  26007824 Browse Files
- 字体更换 · c3042b92
  王祖波 authored Nov 06, 2024
  
  c3042b92 Browse Files
- 字体更换 · 34021852
  王祖波 authored Nov 06, 2024
  
  34021852 Browse Files
- 字体更换 · 75d8aa0b
  王祖波 authored Nov 06, 2024
  
  75d8aa0b Browse Files
- 字体更换 · 6586607e
  王祖波 authored Nov 06, 2024
  
  6586607e Browse Files
- Merge branch 'feature-2024-11-05-add-store-status-filter' into 'master' · 9236f7c1
```
Feature 2024 11 05 add store status filter

See merge request !2302
```
  guojx authored Nov 06, 2024
  9236f7c1 Browse Files
- 兼容店长和店员登陆 · 7f6d8705
  guojuxing authored Nov 06, 2024
  
  7f6d8705 Browse Files
- 获取导购管辖门店数量兼容区经和店长店员 · e4c2176b
  guojuxing authored Nov 06, 2024
  
  e4c2176b Browse Files
- 字体更换 · 39baa146
  王祖波 authored Nov 06, 2024
  
  39baa146 Browse Files
- 字体更换 · 4046f1cf
  王祖波 authored Nov 06, 2024
  
  4046f1cf 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
- 群聊 · 9c550ff7
  徐高华 authored Nov 06, 2024
  
  9c550ff7 Browse Files
05 Nov, 2024 6 commits
- Revert "字体更换" · 8a1c8635
```
This reverts commit 18117e1a.
```
  王祖波 authored Nov 05, 2024
  8a1c8635 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
- 如果没有权限，则返回空数组 · 4b92dc1a
  guojx authored Nov 05, 2024
  
  4b92dc1a 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 1 commit
- Merge remote-tracking branch 'origin/feature-chat-activity' into feature-chat-activity · f0bce7f4
  xiongjiangtao authored Nov 01, 2024
  
  f0bce7f4 Browse Files