Commits · 3331858e94a142a0ed4c52186d00df094284c3a5 · haoban3.0 / haoban-manage3.0 · GitLab

14 Jul, 2025 4 commits
- Merge branch 'feature/xgh/202507迭代' into 'developer' · 3331858e
```
通知数据

See merge request !3072
```
  徐高华 authored Jul 14, 2025
  3331858e Browse Files
- 通知数据 · 9d0d4d1c
  徐高华 authored Jul 14, 2025
  
  9d0d4d1c Browse Files
- Merge branch 'feature-domain' into 'developer' · 7e584d89
```
Feature domain

See merge request !3070
```
  王祖波 authored Jul 14, 2025
  7e584d89 Browse Files
- 统一方法校验是否是达摩cos · f947a141
  王祖波 authored Jul 14, 2025
  
  f947a141 Browse Files
11 Jul, 2025 3 commits
- Merge branch 'feature/xgh/202506迭代' into 'developer' · 8a50214c
```
社区链接

See merge request !3069
```
  徐高华 authored Jul 11, 2025
  8a50214c Browse Files
- 社区链接 · 19e7c963
  徐高华 authored Jul 11, 2025
  
  19e7c963 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'developer' · 5a12df6e
```
Feature/xgh/202506迭代

See merge request !3068
```
  徐高华 authored Jul 11, 2025
  5a12df6e Browse Files
10 Jul, 2025 2 commits
- qwInfo缓存 · f4d76520
  徐高华 authored Jul 10, 2025
  
  f4d76520 Browse Files
- qwInfo缓存 · 603a7bd8
  徐高华 authored Jul 10, 2025
  
  603a7bd8 Browse Files
08 Jul, 2025 14 commits
- Merge branch 'feature/xgh/202506迭代' into 'developer' · d0d7ad39
```
Feature/xgh/202506迭代

See merge request !3067
```
  徐高华 authored Jul 08, 2025
  d0d7ad39 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'master' · dc5d1309
```
朋友圈死循环

See merge request !3066
```
  徐高华 authored Jul 08, 2025
  dc5d1309 Browse Files
- 朋友圈死循环 · f150a36c
  徐高华 authored Jul 08, 2025
  
  f150a36c Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'master' · e43400a9
```
门店活码

See merge request !3065
```
  徐高华 authored Jul 08, 2025
  e43400a9 Browse Files
- 门店活码 · 0b1ce1b2
  徐高华 authored Jul 08, 2025
  
  0b1ce1b2 Browse Files
- Merge branch 'feature/20250618-erqian' into 'master' · 55294af3
```
Feature/20250618 erqian

See merge request !3064
```
  xiehongfei authored Jul 08, 2025
  55294af3 Browse Files
- Merge branch 'master' into feature/20250618-erqian · 166f1dc4
  xiehongfei authored Jul 08, 2025
  
  166f1dc4 Browse Files
- Merge branch 'feature/xgh/202506迭代' into 'master' · dfbe4484
```
Feature/xgh/202506迭代

See merge request !3061
```
  徐高华 authored Jul 08, 2025
  dfbe4484 Browse Files
- Merge branch 'feature-recommend3' into 'master' · c36e009e
```
异常处理

See merge request !3063
```
  王祖波 authored Jul 08, 2025
  c36e009e Browse Files
- Merge branch 'feature-recommend3' into 'developer' · 13883dc6
```
异常处理

See merge request !3062
```
  王祖波 authored Jul 08, 2025
  13883dc6 Browse Files
- 异常处理 · 392ca027
  王祖波 authored Jul 08, 2025
  
  392ca027 Browse Files
- Merge branch 'feature-recommend3' into 'master' · 015c6580
```
记录是否自动建联

See merge request !3060
```
  王祖波 authored Jul 08, 2025
  015c6580 Browse Files
- Merge branch 'feature-biz202506' into 'master' · 2172f6be
```
Feature biz202506

See merge request !3059
```
  王祖波 authored Jul 08, 2025
  2172f6be Browse Files
- 菜单非空判断 · 86f9c432
  徐高华 authored Jul 08, 2025
  
  86f9c432 Browse Files
07 Jul, 2025 4 commits
- Merge branch 'feature/xgh/202506迭代' into 'developer' · c683569d
```
区经看会员详情

See merge request !3058
```
  徐高华 authored Jul 07, 2025
  c683569d Browse Files
- 区经看会员详情 · 3c1f6213
  徐高华 authored Jul 07, 2025
  
  3c1f6213 Browse Files
- Merge branch 'feature/20250618-erqian' into developer · 3d1209e3
  xiehongfei authored Jul 07, 2025
  
  3d1209e3 Browse Files
- fix：导购明细导出修改 · 6ee42af0
  xiehongfei authored Jul 07, 2025
  
  6ee42af0 Browse Files
04 Jul, 2025 13 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