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

04 Jul, 2025 15 commits
- Merge branch 'feature/20250618-erqian' into developer · bcd039b0
  xiehongfei authored Jul 04, 2025
  
  bcd039b0 Browse Files
- fix：log-info npe fix · bf07eba7
  xiehongfei authored Jul 04, 2025
  
  bf07eba7 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'developer' · 3aa4669c
```
素材

See merge request !3057
```
  徐高华 authored Jul 04, 2025
  3aa4669c Browse Files
- 素材 · e608a5a2
  徐高华 authored Jul 04, 2025
  
  e608a5a2 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'developer' · 072bd9d1
```
素材

See merge request !3056
```
  徐高华 authored Jul 04, 2025
  072bd9d1 Browse Files
- 素材 · 89a9a9f7
  徐高华 authored Jul 04, 2025
  
  89a9a9f7 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'developer' · fb8a001d
```
素材

See merge request !3055
```
  徐高华 authored Jul 04, 2025
  fb8a001d Browse Files
- 素材 · af54f707
  徐高华 authored Jul 04, 2025
  
  af54f707 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'developer' · cde000d7
```
Feature/xgh/202506迭代

See merge request !3054
```
  徐高华 authored Jul 04, 2025
  cde000d7 Browse Files
- Merge branch 'master' into feature/xgh/202506迭代 · 213c70c0
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
```
  徐高华 authored Jul 04, 2025
  213c70c0 Browse Files
- Merge branch 'feature/20250618-erqian' into developer · b23edcac
  xiehongfei authored Jul 04, 2025
  
  b23edcac Browse Files
- fix：修改clerkIsSuperAdmin为是否有所有门店的管辖权限 · 885ec8c9
  xiehongfei authored Jul 04, 2025
  
  885ec8c9 Browse Files
- Merge branch 'feature/20250618-erqian' into developer · 7ece3c7d
  xiehongfei authored Jul 04, 2025
  
  7ece3c7d Browse Files
- feat：新增区经角色好办访问数据 · d227321e
  xiehongfei authored Jul 04, 2025
  
  d227321e Browse Files
- 伪登录 · bcfb3d40
  徐高华 authored Jul 04, 2025
  
  bcfb3d40 Browse Files
03 Jul, 2025 4 commits
- Merge branch 'feature/xgh/202506迭代' into 'developer' · 7789b096
```
bug

See merge request !3050
```
  徐高华 authored Jul 03, 2025
  7789b096 Browse Files
- bug · 5bbd2e24
  徐高华 authored Jul 03, 2025
  
  5bbd2e24 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'developer' · a53db698
```
刷新自建token

See merge request !3049
```
  徐高华 authored Jul 03, 2025
  a53db698 Browse Files
- 刷新自建token · 65559e3e
  徐高华 authored Jul 03, 2025
  
  65559e3e Browse Files
02 Jul, 2025 3 commits
- Merge branch 'feature/xgh/202506迭代' into 'developer' · 9746098a
```
Feature/xgh/202506迭代

See merge request !3048
```
  徐高华 authored Jul 02, 2025
  9746098a Browse Files
- null · faa714af
  徐高华 authored Jul 02, 2025
  
  faa714af Browse Files
- null · dd60382c
  徐高华 authored Jul 02, 2025
  
  dd60382c Browse Files
01 Jul, 2025 3 commits
- Merge remote-tracking branch 'origin/developer' into developer · 4e3bb4a1
  王祖波 authored Jul 01, 2025
  
  4e3bb4a1 Browse Files
- Merge branch 'feature-recommend3' into developer · a267f92b
  王祖波 authored Jul 01, 2025
  
  a267f92b Browse Files
- 记录是否自动建联 · c90d1a7d
  王祖波 authored Jul 01, 2025
  
  c90d1a7d Browse Files
30 Jun, 2025 10 commits
- Merge branch 'feature/xgh/202506迭代' into 'developer' · a2461ba8
```
Feature/xgh/202506迭代

See merge request !3047
```
  徐高华 authored Jun 30, 2025
  a2461ba8 Browse Files
- 手动配置过的群活码直接匹配 · 137147b4
  徐高华 authored Jun 30, 2025
  
  137147b4 Browse Files
- 手动配置过的群活码直接匹配 · 6f3d4c19
  徐高华 authored Jun 30, 2025
  
  6f3d4c19 Browse Files
- 手动配置过的群活码直接匹配 · dca45701
  徐高华 authored Jun 30, 2025
  
  dca45701 Browse Files
- Merge branch 'feature/xgh/20250609' into 'master' · 6c34cd98
```
非空判断

See merge request !3046
```
  徐高华 authored Jun 30, 2025
  6c34cd98 Browse Files
- Merge branch 'feature/xgh/20250609' into 'developer' · cd169545
```
非空判断

See merge request !3045
```
  徐高华 authored Jun 30, 2025
  cd169545 Browse Files
- 非空判断 · 30876b28
  徐高华 authored Jun 30, 2025
  
  30876b28 Browse Files
- Merge branch 'feature/xgh/20250609' into 'master' · 28bb5a28
```
log

See merge request !3044
```
  徐高华 authored Jun 30, 2025
  28bb5a28 Browse Files
- Merge branch 'feature/xgh/20250609' into 'developer' · 6df81d1c
```
log

See merge request !3043
```
  徐高华 authored Jun 30, 2025
  6df81d1c Browse Files
- log · 1ab1e5a6
  徐高华 authored Jun 30, 2025
  
  1ab1e5a6 Browse Files
27 Jun, 2025 5 commits
- Merge branch 'feature/xgh/20250609' into 'developer' · 1596b2a3
```
异常

See merge request !3042
```
  徐高华 authored Jun 27, 2025
  1596b2a3 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'developer' · 22b0cc5d
```
log

See merge request !3041
```
  徐高华 authored Jun 27, 2025
  22b0cc5d Browse Files
- Merge branch 'feature/xgh/20250609' into 'master' · 416a0f89
```
异常

See merge request !3040
```
  徐高华 authored Jun 27, 2025
  416a0f89 Browse Files
- log · 33390512
  徐高华 authored Jun 27, 2025
  
  33390512 Browse Files
- 异常 · 041f853d
  徐高华 authored Jun 27, 2025
  
  041f853d Browse Files